From 42f461b507683b973a22f97c4d31ec15e475e19c Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Fri, 15 Apr 2011 00:56:02 +0100 Subject: [PATCH] [repo] get remote changes beffore pushing changes that weren't pushed due to a disconnect --- SparkleLib/SparkleRepo.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs index 03171709..77cf9337 100644 --- a/SparkleLib/SparkleRepo.cs +++ b/SparkleLib/SparkleRepo.cs @@ -334,8 +334,10 @@ namespace SparkleLib { } - if (_HasUnsyncedChanges) + if (_HasUnsyncedChanges) { + CheckForRemoteChanges (); Push (); + }; }; @@ -846,9 +848,6 @@ namespace SparkleLib { if (PushingFailed != null) PushingFailed (this, args); - - CheckForRemoteChanges (); - Push (); } else {