Page MenuHomePhabricator

merge: only abort in IMM if files are actually marked as driver-resolved
AbandonedPublic

Authored by phillco on Jan 5 2018, 1:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

Before, we would raise whenever the usemergedriver condition was set when merging in-memory,
which equated to "any merge with (cd, dc, or m) actions in a repo with a mergedriver script".
This was done to be as conservative as possible.

However, a better solution is to run the preprocess() script and only raise if any files are
marked to actually be driver-resolved. That way we only restart the merge if we absolutely need
to.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Jan 5 2018, 1:01 PM
phillco updated this revision to Diff 4713.Jan 5 2018, 1:03 PM
phillco edited the summary of this revision. (Show Details)Jan 5 2018, 1:04 PM
phillco abandoned this revision.Jan 5 2018, 1:14 PM