From da2ddd3f782202bed965830379672079547846ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Rekucki?= Date: Thu, 8 Oct 2009 17:41:06 +0200 Subject: [PATCH 1/1] Fix in RAL. --- lib/wlrepo/mercurial_backend/document.py | 6 ++++++ 1 file changed, 6 insertions(+) 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" -- 2.20.1