Patchwork D7994: merge: check that there are no conflicts after --abort

login
register
mail settings
Submitter phabricator
Date Jan. 25, 2020, 12:17 a.m.
Message ID <differential-rev-PHID-DREV-3imwyxlgrqjtpj76ahha-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44641/
State Superseded
Headers show

Comments

phabricator - Jan. 25, 2020, 12:17 a.m.
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




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

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(