Fix in RAL.
authorŁukasz Rekucki <lrekucki@gmail.com>
Thu, 8 Oct 2009 15:41:06 +0000 (17:41 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Thu, 8 Oct 2009 15:41:06 +0000 (17:41 +0200)
lib/wlrepo/mercurial_backend/document.py

index d1c3e53..a8f7adc 100644 (file)
@@ -161,6 +161,9 @@ class MercurialDocument(wlrepo.Document):
                 if not local.parentof(main):
                     success, changed = main.merge_with(local, user=user, message=message)
 
                 if not local.parentof(main):
                     success, changed = main.merge_with(local, user=user, message=message)
 
+                success = True
+                changed = False
+
             # Case 3:
             # main *
             #      |
             # Case 3:
             # main *
             #      |
@@ -180,6 +183,9 @@ class MercurialDocument(wlrepo.Document):
                 if not local.parentof(main):
                     success, changed = local.merge_with(main, user=user, \
                         message='$AUTO$ Local branch update during share.')
                 if not local.parentof(main):
                     success, changed = local.merge_with(main, user=user, \
                         message='$AUTO$ Local branch update during share.')
+
+                success = True
+                changed = False
                     
             else:
                 print "case 4"
                     
             else:
                 print "case 4"