( )⚙ D10148 mergestate: don't pop stateextras when there are no conflicts on filemerge

This is an archive of the discontinued Mercurial Phabricator instance.

mergestate: don't pop stateextras when there are no conflicts on filemerge
ClosedPublic

Authored by pulkit on Mar 10 2021, 4:04 AM.

Details

Summary

Even if filemerge.filemerge() didn't result in conflicts, we should not remove
stateextras for a file since we now use that for more things than just merge
time information. We use stateextras to store information which is required to
be used by commit.

I tracked this down while finding why a patch of mine which adds more commit
related information does not work as expected and looses the extras in
mergestate.

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.Mar 10 2021, 4:04 AM
Alphare accepted this revision.Mar 10 2021, 6:42 AM
marmoute accepted this revision.Mar 17 2021, 10:27 AM
This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.