Page MenuHomePhabricator

filemerge: only raise InMemoryMergeConflictsError when running _xmerge
ClosedPublic

Authored by phillco on Dec 20 2017, 6:22 PM.

Details

Summary

The old code here was overly broad and would raise in cases when we didn't end
up calling xmerge and resolved using an internal tool (such as when
premerge=True).

Instead, let's swap out _xmerge if IMM is enabled and have the new tool raise
when called, which is the behavior we want.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco created this revision.Dec 20 2017, 6:22 PM
durin42 accepted this revision.Dec 20 2017, 8:33 PM
This revision is now accepted and ready to land.Dec 20 2017, 8:33 PM
This revision was automatically updated to reflect the committed changes.