repo git: on conflicts, put timestamp before file extension. Fixes #699

hbons · Apr 15, 2012 · 6acf096 · 6acf096
1 parent 7017bbc
commit 6acf096
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
@@ -491,7 +491,9 @@ private void ResolveConflict ()
                     // Windows doesn't allow colons in the file name, so
                     // we use "h" between the hours and minutes instead.
                     string timestamp            = DateTime.Now.ToString ("MMM d H\\hmm");
-                    string their_path           = conflicting_path + " (" + SparkleConfig.DefaultConfig.User.Name + ", " + timestamp + ")";
+                    string their_path           = Path.GetFileNameWithoutExtension (conflicting_path) +
+                        " (" + SparkleConfig.DefaultConfig.User.Name + ", " + timestamp + ")" + Path.GetExtension (conflicting_path);
+
                     string abs_conflicting_path = Path.Combine (LocalPath, conflicting_path);
                     string abs_their_path       = Path.Combine (LocalPath, their_path);