From: Ɓukasz Rekucki Date: Thu, 8 Oct 2009 15:41:06 +0000 (+0200) Subject: Fix in RAL. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/da2ddd3f782202bed965830379672079547846ff?ds=sidebyside;hp=69a0d5ba5c8f90d0c0006f7c14aae89875f66441 Fix in RAL. --- diff --git a/lib/wlrepo/mercurial_backend/document.py b/lib/wlrepo/mercurial_backend/document.py index d1c3e53d..a8f7adc3 100644 --- a/lib/wlrepo/mercurial_backend/document.py +++ b/lib/wlrepo/mercurial_backend/document.py @@ -161,6 +161,9 @@ class MercurialDocument(wlrepo.Document): if not local.parentof(main): success, changed = main.merge_with(local, user=user, message=message) + success = True + changed = False + # 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.') + + success = True + changed = False else: print "case 4"