HomePhabricator

fix: again allow formatting the working copy while merging

Authored by martinvonz.

Description

fix: again allow formatting the working copy while merging

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.

Differential Revision: https://phab.mercurial-scm.org/D11376

Details

Committed
martinvonzAug 27 2021, 4:51 PM
Differential Revision
D11376: fix: again allow formatting the working copy while merging
Parents
rHG3962503cd1e8: pyoxidizer: add arch to PyOxidizer MSIs
Branches
Unknown
Tags
Unknown