Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
48270:3e66e4517744 48271:5228a6dc212b
1711 repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg)) 1711 repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg))
1712 ms.addcommitinfo(f, {b'merged': b'yes'}) 1712 ms.addcommitinfo(f, {b'merged': b'yes'})
1713 progress.increment(item=f, total=numupdates) 1713 progress.increment(item=f, total=numupdates)
1714 ms.resolve(f, wctx) 1714 ms.resolve(f, wctx)
1715 1715
1716 except error.InterventionRequired:
1717 # If the user has merge.on-failure=halt, catch the error and close the
1718 # merge state "properly".
1719 pass
1716 finally: 1720 finally:
1717 ms.commit() 1721 ms.commit()
1718 1722
1719 unresolved = ms.unresolvedcount() 1723 unresolved = ms.unresolvedcount()
1720 1724