Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names
This commit is contained in:
parent
4295c8b88f
commit
a0db35d877
|
@ -320,8 +320,10 @@ namespace SparkleLib {
|
||||||
git_theirs.Start ();
|
git_theirs.Start ();
|
||||||
git_theirs.WaitForExit ();
|
git_theirs.WaitForExit ();
|
||||||
|
|
||||||
// Append a timestamp to local version
|
// Append a timestamp to local version.
|
||||||
string timestamp = DateTime.Now.ToString ("HH:mm MMM d");
|
// Windows doesn't allow colons in the file name, so
|
||||||
|
// we use "h" between the hours and minutes instead.
|
||||||
|
string timestamp = DateTime.Now.ToString ("HH\\hmm MMM d");
|
||||||
string their_path = conflicting_path + " (" + SparkleConfig.DefaultConfig.User.Name + ", " + timestamp + ")";
|
string their_path = conflicting_path + " (" + SparkleConfig.DefaultConfig.User.Name + ", " + timestamp + ")";
|
||||||
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