Mercurial > hg

diff mercurial/merge.py @ 48271:5228a6dc212b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge-halt: fix issue with merge.on-failure=halt breaking unshelve Differential Revision: https://phab.mercurial-scm.org/D11706
author Kyle Lippincott <spectral@google.com>
date Tue, 19 Oct 2021 16:14:53 -0700
parents c8d6e23fb14a
children 96aa3a68d3b5
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Oct 19 16:14:46 2021 -0700
+++ b/mercurial/merge.py	Tue Oct 19 16:14:53 2021 -0700
@@ -1713,6 +1713,10 @@
             progress.increment(item=f, total=numupdates)
             ms.resolve(f, wctx)
 
+    except error.InterventionRequired:
+        # If the user has merge.on-failure=halt, catch the error and close the
+        # merge state "properly".
+        pass
     finally:
         ms.commit()