( )⚙ D11999 merge: consider the file merged when using :merge-{local,other}

This is an archive of the discontinued Mercurial Phabricator instance.

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

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



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

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

Event Timeline

martinvonz created this revision.Jan 14 2022, 12:48 PM
Alphare accepted this revision.Jan 17 2022, 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.Jan 17 2022, 8:00 AM