repo git: on conflicts, put timestamp before file extension. Fixes #699
This commit is contained in:
parent
06b821a3a3
commit
192779a1b7
|
@ -491,7 +491,9 @@ namespace SparkleLib.Git {
|
||||||
// Windows doesn't allow colons in the file name, so
|
// Windows doesn't allow colons in the file name, so
|
||||||
// we use "h" between the hours and minutes instead.
|
// we use "h" between the hours and minutes instead.
|
||||||
string timestamp = DateTime.Now.ToString ("MMM d H\\hmm");
|
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_conflicting_path = Path.Combine (LocalPath, conflicting_path);
|
||||||
string abs_their_path = Path.Combine (LocalPath, their_path);
|
string abs_their_path = Path.Combine (LocalPath, their_path);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue