changeset 44175:2b6632d64328

merge: check that there are no conflicts after --abort Same idea as in abcc82bf0717 (clean: check that there are no conflicts after, 2020-01-24). We should reuse more code here, but that will come later. Differential Revision: https://phab.mercurial-scm.org/D7994
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Jan 2020 16:00:54 -0800
parents 75c2ca094d3a
children 6744859ff3ee
files mercurial/hg.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Fri Jan 24 15:07:44 2020 -0800
+++ b/mercurial/hg.py	Fri Jan 24 16:00:54 2020 -0800
@@ -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(