Page MenuHomePhabricator

merge: consider the file merged when using :merge-{local,other}
ClosedPublic

Authored by martinvonz on Fri, Jan 14, 12:48 PM.

Details

Summary

Returning None from simplemerge() means that the caller interprets
it as "no merge was necessary (because two sides matched)". See
6217040b2780 and issue2680 for some background. However,
simplemerge() shouldn't even get called in such scenarios, and
returning None means that the file is not considered merged, even
though the contents actually were. See the affected test cases.

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

martinvonz created this revision.Fri, Jan 14, 12:48 PM
Alphare accepted this revision.Mon, Jan 17, 8:00 AM
Alphare added a subscriber: Alphare.

This makes the message more consistent with merging FILE, which always bothered me slightly

This revision is now accepted and ready to land.Mon, Jan 17, 8:00 AM