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

use absolute paths to move our version of conflicting file

Browse source
This commit is contained in:
Hylke Bons 2011-04-29 00:32:16 +02:00
parent f01a3b41e4
commit d584367340
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
SparkleLib/SparkleRepo.cs
View file

@ -423,7 +423,7 @@ namespace SparkleLib {
string [] lines = output.Split ("\n".ToCharArray ()); string [] lines = output.Split ("\n".ToCharArray ());
foreach (string line in lines) { foreach (string line in lines) {
if (line.Length > 1 &&!line [1].Equals (" ")) if (line.Length > 1 && !line [1].Equals (" "))
return true; return true;
} }
@ -582,14 +582,14 @@ namespace SparkleLib {
if (git.ExitCode != 0) { if (git.ExitCode != 0) {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected..."); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected...");
while (AnyDifferences) { // while (AnyDifferences) {
ResolveConflict (); ResolveConflict ();
Add (); Add ();
SparkleGit git_continue = new SparkleGit (LocalPath, "rebase --continue"); SparkleGit git_continue = new SparkleGit (LocalPath, "rebase --continue");
git_continue.Start (); git_continue.Start ();
git_continue.WaitForExit (); git_continue.WaitForExit ();
} //}
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved."); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
@ -599,7 +599,7 @@ namespace SparkleLib {
} }
_CurrentHash = GetCurrentHash (); _CurrentHash = GetCurrentHash ();
Push (); // Push ();
}; };
git.Start (); git.Start ();
@ -636,17 +636,23 @@ namespace SparkleLib {
"checkout --ours " + conflicting_path); "checkout --ours " + conflicting_path);
git_ours.Start (); git_ours.Start ();
git_ours.WaitForExit (); git_ours.WaitForExit ();
Console.WriteLine ("1111111111111111111111");
// Append a timestamp to our version // Append a timestamp to our version
string timestamp = DateTime.Now.ToString ("HH:mm d MMM"); string timestamp = DateTime.Now.ToString ("HH:mm d MMM");
string our_path = conflicting_path + " (" + UserName + ", " + timestamp + ")"; string our_path = conflicting_path + " (" + UserName + ", " + timestamp + ")";
File.Move (conflicting_path, our_path);
string path1 = SparkleHelpers.CombineMore (LocalPath, conflicting_path);
string path2 = SparkleHelpers.CombineMore (LocalPath, our_path);
File.Move (path1, path2);
Console.WriteLine ("2222222222222222222");
// Recover the server's version // Recover the server's version
SparkleGit git_theirs = new SparkleGit (LocalPath, SparkleGit git_theirs = new SparkleGit (LocalPath,
"checkout --theirs " + conflicting_path); "checkout --theirs " + conflicting_path);
git_theirs.Start (); git_theirs.Start ();
git_theirs.WaitForExit (); git_theirs.WaitForExit ();
Console.WriteLine ("33333333333333333333");
} }
} }
} }