Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.applyupdates: don't return early if merge driver's conclude failed
authorSiddharth Agarwal <sid0@fb.com>
Sun, 15 Nov 2015 22:45:20 -0800
changeset 26975 6618dfd3ea1c
parent 26974 4b5dc0d9e899
child 26976 c48fee950ce4
merge.applyupdates: don't return early if merge driver's conclude failed Somewhat silly oversight -- this prevented the progress bar from being reset.
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Mon Nov 16 17:15:36 2015 -0800
+++ b/mercurial/merge.py	Sun Nov 15 22:45:20 2015 -0800
@@ -1014,7 +1014,7 @@
         if not driverconclude(repo, ms, wctx, labels=labels):
             # XXX setting unresolved to at least 1 is a hack to make sure we
             # error out
-            return updated, merged, removed, max(unresolved, 1)
+            unresolved = max(unresolved, 1)
 
         ms.commit()
Mercurial