Page MenuHomePhabricator

fix: again allow formatting the working copy while merging
ClosedPublic

Authored by martinvonz on Aug 27 2021, 5:08 PM.

Details

Summary

I forgot about unfinished merges (I think I was thinking only about
unfinished merge conflicts) when I wrote
https://phab.mercurial-scm.org/D11209. As a coworker (hg contributor
dploch) reported to me, this led to hg fix --working-dir failing
when you have an uncommitted merge. The fix is trivial: just move the
assertion to just before the call to scmutil.movedirstate() where it
actually matters.

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.Aug 27 2021, 5:08 PM
Alphare accepted this revision.Aug 30 2021, 4:53 AM
This revision is now accepted and ready to land.Aug 30 2021, 4:53 AM