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

login
register
mail settings
Submitter phabricator
Date Jan. 26, 2020, 12:25 a.m.
Message ID <8b18cb6d034981975c774f8c45c927a6@localhost.localdomain>
Download mbox | patch
Permalink /patch/44665/
State Not Applicable
Headers show

Comments

phabricator - Jan. 26, 2020, 12:25 a.m.
Closed by commit rHG2b6632d64328: merge: check that there are no conflicts after --abort (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7994?vs=19585&id=19613

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7994/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7994

AFFECTED FILES
  mercurial/hg.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
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(