Patchwork D951: merge: allow user to halt merge on merge-tool failures

login
register
mail settings
Submitter phabricator
Date Oct. 17, 2017, 1:47 a.m.
Message ID <a0e5105913947d91d1aa06ba03d2a718@localhost.localdomain>
Download mbox | patch
Permalink /patch/25061/
State Not Applicable
Headers show

Comments

phabricator - Oct. 17, 2017, 1:47 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf583cef55995: merge: allow user to halt merge on merge-tool failures (authored by ryanmce, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D951?vs=2502&id=2877

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

AFFECTED FILES
  mercurial/filemerge.py
  tests/test-merge-halt.t

CHANGE DETAILS




To: ryanmce, #hg-reviewers, mbthomas, durin42
Cc: mercurial-devel

Patch

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
@@ -739,6 +739,7 @@ 
         if r:
             if onfailure:
                 ui.warn(onfailure % fd)
+            _onfilemergefailure(ui)
 
         return True, r, deleted
     finally: