From patchwork Tue Oct 17 01:47:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D951: merge: allow user to halt merge on merge-tool failures From: phabricator X-Patchwork-Id: 25061 Message-Id: To: mercurial-devel@mercurial-scm.org Date: Tue, 17 Oct 2017 01:47:46 +0000 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 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: