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

disable file monitoring while resolving conflicts

Browse source
This commit is contained in:
Hylke Bons 2010-05-23 18:57:18 +01:00
parent c90251764d
commit 68ada3a206
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SparkleShare/SparkleRepo.cs
View file

@ -243,6 +243,8 @@ namespace SparkleShare {
Process.WaitForExit ();
Process.Start();
Watcher.EnableRaisingEvents = false;
foreach (string Line in Regex.Split (Output, "\n")) {
if (Line.Contains ("needs merge")) {
@ -261,7 +263,7 @@ namespace SparkleShare {
File.Move (ProblemFileName,
ProblemFileName + " (" + UserName + " - " +
TimeStamp);
TimeStamp + ")");
Process.StartInfo.Arguments
= "checkout --theirs " + ProblemFileName;
@ -286,6 +288,8 @@ namespace SparkleShare {
Process.Start();
Console.WriteLine ("[Git][" + Name + "] Conflict resolved.");
Watcher.EnableRaisingEvents = true;
Push ();
Fetch ();