Page MenuHomePhabricator

merge: move an inspection of the dirstate from record to calculate phase

Authored by martinvonz on Jun 5 2020, 9:37 PM.



The intent is clearly to have calculateupdates() figure out what
actions need to be taken and recordupdates() to make necessary
modifications to the dirstate. However, in the
ACTION_PATH_CONFLICT_RESOLVE case, there was one little inspection
of copy information done in recordupdates(). This patch moves that
to calculateupdates(). That will help with the next patch, which
makes merge.update() work better with overlayworkingctx (copies
should be recorded there too, even though we skip the
recordupdates() step).

Diff Detail

rHG Mercurial
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.