This is an archive of the discontinued Mercurial Phabricator instance.

merge: use in-memory mergestate when using in-memory context

Authored by martinvonz on Sep 17 2020, 4:10 PM.



This is my version of Augie's D8568. It makes it so we don't touch the
mergestate on disk when using an in-memory context.

The reason that I want this is not the same as the reason that Augie
write his patch (though I agree with that reason too). My hope is to
make in-memory rebase not fall back to on-disk rebase when there are
conflict. I plan to do that by adding a
overlayworkingctx.reflect_in_workingcopy(). The idea is that that
will update the working copy, the dirstate and the mergestate as

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.Sep 17 2020, 4:10 PM
indygreg accepted this revision.Sep 17 2020, 10:24 PM
This revision is now accepted and ready to land.Sep 17 2020, 10:24 PM