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

[repo] pull before pushing in every situation

Browse source
This commit is contained in:
Hylke Bons 2011-04-15 01:28:42 +01:00
parent 42f461b507
commit d4bdea0be6
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SparkleLib/SparkleRepo.cs
View file

@ -334,10 +334,8 @@ namespace SparkleLib {
} }
if (_HasUnsyncedChanges) { if (_HasUnsyncedChanges)
CheckForRemoteChanges (); FetchRebaseAndPush ();
Push ();
};
}; };
@ -590,7 +588,14 @@ namespace SparkleLib {
} }
} }
public void FetchRebaseAndPush ()
{
CheckForRemoteChanges ();
Push ();
}
public bool AnyDifferences { public bool AnyDifferences {
@ -849,6 +854,8 @@ namespace SparkleLib {
if (PushingFailed != null) if (PushingFailed != null)
PushingFailed (this, args); PushingFailed (this, args);
FetchRebaseAndPush ();
} else { } else {
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes pushed."); SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Changes pushed.");