It turns out this isn't needed -- setting the return to 1 means we catch the failure in the generic handler I added earlier. I fixed up the tests in the previous patch to include the important test changes from here (ie, more testing of the prompt stuff).

durin42 mentioned this in D952: merge: additional test cases to show merge-halting behavior.Oct 16 2017, 9:41 PM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/filemerge.py (2 lines)
M			tests/test-merge-halt.t (7 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	2456			Oct 5 2017, 5:17 AM	★	★

Status	Author	Revision
Abandoned	ryanmce	D953 merge: use filemerge failure handler in post-filemerge checks checks
Closed	ryanmce	D952 merge: additional test cases to show merge-halting behavior
Closed	ryanmce	D951 merge: allow user to halt merge on merge-tool failures
Closed	ryanmce	D932 filemerge: introduce functions to halt merge flow
Closed	ryanmce	D931 merge: ensure that we always commit the mergestate
Closed	ryanmce	D930 merge: add tests to show current behavior on failed filemerges

merge: use filemerge failure handler in post-filemerge checks checksAbandonedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 2456

mercurial/filemerge.py

tests/test-merge-halt.t

merge: use filemerge failure handler in post-filemerge checks checks
AbandonedPublic
Actions

Revision Contents
Changeset List