D951: merge: allow user to halt merge on merge-tool failures
ryanmce (Ryan McElroy)
phabricator at mercurial-scm.org
Fri Oct 6 13:51:43 UTC 2017
ryanmce updated this revision to Diff 2502.
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D951?vs=2454&id=2502
REVISION DETAIL
https://phab.mercurial-scm.org/D951
AFFECTED FILES
mercurial/filemerge.py
tests/test-merge-halt.t
CHANGE DETAILS
diff --git a/tests/test-merge-halt.t b/tests/test-merge-halt.t
--- a/tests/test-merge-halt.t
+++ b/tests/test-merge-halt.t
@@ -44,8 +44,7 @@
merging a
merging b
merging a failed!
- merging b failed!
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ merge halted after failed merge (see hg resolve)
[1]
$ hg resolve --list
@@ -65,8 +64,10 @@
merging a
merging b
merging a failed!
+ continue merge operation (yn)? y
merging b failed!
- unresolved conflicts (see hg resolve, then hg rebase --continue)
+ continue merge operation (yn)? n
+ merge halted after failed merge (see hg resolve)
[1]
$ hg resolve --list
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -715,6 +715,7 @@
if r:
if onfailure:
ui.warn(onfailure % fd)
+ _onfilemergefailure(ui)
return True, r, deleted
finally:
To: ryanmce, #hg-reviewers, mbthomas
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list