Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 6acf096735c0b206f2624d6b8a7a58d27afcb30e 1 parent 7017bbc
@hbons authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 SparkleLib/Git/SparkleRepoGit.cs
View
4 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);
Please sign in to comment.
Something went wrong with that request. Please try again.