beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use 'h' as hour-minute separator, as Windows doesn't allow ':' in file names

Browse source
This commit is contained in:
Hylke Bons 2011-08-27 02:42:09 +02:00
parent 4295c8b88f
commit a0db35d877
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -320,8 +320,10 @@ namespace SparkleLib {
git_theirs.Start ();
git_theirs.WaitForExit ();
// Append a timestamp to local version
string timestamp = DateTime.Now.ToString ("HH:mm MMM d");
// Append a timestamp to local version.
// 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 abs_conflicting_path = Path.Combine (LocalPath, conflicting_path);
string abs_their_path = Path.Combine (LocalPath, their_path);