Page MenuHomePhabricator

dirstate: use a new `drop_merge_data` in `setparent`
ClosedPublic

Authored by SimonSapin on Tue, Sep 28, 3:54 PM.

Details

Summary

What is happening in this setparent loop is that we remove all merge
related information when the dirstate is moved out of a merge situation.

So instead of shuffling state to get them where we want, we simply add a method
on the DirstateItem to do drop the information we want dropped.

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

SimonSapin created this revision.Tue, Sep 28, 3:54 PM
Alphare requested changes to this revision.Wed, Sep 29, 4:45 AM
Alphare added a subscriber: Alphare.

Please do a typo pass on this, it's a bit hard to read. The change looks good otherwise

This revision now requires changes to proceed.Wed, Sep 29, 4:45 AM
marmoute edited the summary of this revision. (Show Details)Wed, Sep 29, 5:04 AM
Alphare accepted this revision.Thu, Sep 30, 9:45 AM
This revision is now accepted and ready to land.Thu, Sep 30, 9:45 AM
This revision was automatically updated to reflect the committed changes.