repo: set HasUnsyncedChanges to true after a resolved conflict, so we'll push them later
This commit is contained in:
parent
2e6d8ac33e
commit
00327a1eb0
|
@ -118,12 +118,10 @@ namespace SparkleLib {
|
|||
git.Start ();
|
||||
git.WaitForExit ();
|
||||
|
||||
if (git.ExitCode == 0) {
|
||||
if (git.ExitCode == 0)
|
||||
return true;
|
||||
} else {
|
||||
else
|
||||
return false;
|
||||
//FetchRebaseAndPush ();TODO
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -252,7 +250,6 @@ namespace SparkleLib {
|
|||
EnableWatching ();
|
||||
|
||||
OnConflictResolved ();
|
||||
RequestStatus (SyncStatus.SyncUp);
|
||||
}
|
||||
|
||||
EnableWatching ();
|
||||
|
|
|
@ -164,6 +164,8 @@ namespace SparkleLib {
|
|||
|
||||
protected void OnConflictResolved ()
|
||||
{
|
||||
HasUnsyncedChanges = true;
|
||||
|
||||
if (ConflictResolved != null)
|
||||
ConflictResolved ();
|
||||
}
|
||||
|
@ -346,13 +348,6 @@ namespace SparkleLib {
|
|||
}
|
||||
|
||||
|
||||
protected void RequestStatus (SyncStatus requested_status)
|
||||
{
|
||||
if (requested_status == SyncStatus.SyncUp)
|
||||
SyncUpBase ();
|
||||
}
|
||||
|
||||
|
||||
private void SyncUpBase ()
|
||||
{
|
||||
try {
|
||||
|
@ -416,8 +411,11 @@ namespace SparkleLib {
|
|||
if (SyncStatusChanged != null)
|
||||
SyncStatusChanged (SyncStatus.Idle);
|
||||
|
||||
// There could be changes from a
|
||||
// resolved conflict
|
||||
if (HasUnsyncedChanges)
|
||||
SyncUp ();
|
||||
|
||||
} else {
|
||||
SparkleHelpers.DebugInfo ("SyncDown", "[" + Name + "] Error");
|
||||
this.server_online = false;
|
||||
|
|
Loading…
Reference in a new issue