D7994: merge: check that there are no conflicts after --abort
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Jan 25 00:17:55 UTC 2020
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Same idea as in abcc82bf0717 <https://phab.mercurial-scm.org/rHGabcc82bf0717ddedb4d268471410c788759fecdf> (clean: check that there are no conflicts
after, 2020-01-24). We should reuse more code here, but that will come
later.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D7994
AFFECTED FILES
mercurial/hg.py
CHANGE DETAILS
diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1183,8 +1183,8 @@
repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
stats = mergemod.update(repo, node, branchmerge=False, force=True)
+ assert stats.unresolvedcount == 0
_showstats(repo, stats)
- return stats.unresolvedcount > 0
def _incoming(
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list