Page MenuHomePhabricator

mergestate: make `_resolve()` do both preresolve and resolve
ClosedPublic

Authored by martinvonz on Dec 4 2021, 2:06 AM.

Details

Summary

This patch removes the preresolve argument from _resolve() and
makes it do both the "preresolve" and "resolve" steps without the
caller having to call it twice.

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

martinvonz created this revision.Dec 4 2021, 2:06 AM
Alphare accepted this revision.Dec 7 2021, 10:27 AM
This revision is now accepted and ready to land.Dec 7 2021, 10:27 AM