This is an archive of the discontinued Mercurial Phabricator instance.

merge: add removefile() to mergeresult object
ClosedPublic

Authored by pulkit on Jul 25 2020, 6:00 AM.

Details

Summary

There are cases where some further calculation makes the file not needing to be
merged anymore and hence needs to be dropped in mergeresult object. This adds a
function for that.

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

pulkit created this revision.Jul 25 2020, 6:00 AM
indygreg accepted this revision.Aug 2 2020, 1:00 PM
This revision is now accepted and ready to land.Aug 2 2020, 1:00 PM
This revision was automatically updated to reflect the committed changes.