Page MenuHomePhabricator

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

Authored by ryanmce on Oct 5 2017, 5:17 AM.

Details

Reviewers
mbthomas
Group Reviewers
hg-reviewers
Summary

Depends on D952.

This allows the user to halt the merge if conflict markers or no changes are
found in the merged file as well.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

ryanmce created this revision.Oct 5 2017, 5:17 AM
mbthomas accepted this revision.Oct 6 2017, 5:23 AM
mbthomas added a subscriber: mbthomas.

Stack all looks good to me.

ryanmce abandoned this revision.Oct 6 2017, 9:47 AM

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).