quark added a comment. I have sent https://phab.mercurial-scm.org/D527 which solves this issue (and more) without introducing special states. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D24 To: quark, durin42, #hg-reviewers Cc: martinvonz, durin42, mercurial-devel