This is an archive of the discontinued Mercurial Phabricator instance.

merge: add a 'keepconflictparent' argument to graft

Authored by lothiraldan on Jun 5 2018, 6:58 AM.



Before this change, merge.graft was always dropping the "grafted" changeset
from the parent. This is impractical in case of conflict as the second parent
can be useful to help with conflict resolution.

We add a new boolean parameter to control this behavior. This will make using
merge.graft directly in shelve practicable.

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

lothiraldan created this revision.Jun 5 2018, 6:58 AM
pulkit accepted this revision.Jun 29 2018, 3:07 PM
pulkit added a subscriber: pulkit.

Looks like this will help fixing issue5927 too.

This revision was automatically updated to reflect the committed changes.