Submitter | phabricator |
---|---|
Date | May 18, 2020, 10:07 p.m. |
Message ID | <differential-rev-PHID-DREV-6mj6abuuzezk5tdqbdsj-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/46340/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/hgext/strip.py b/hgext/strip.py --- a/hgext/strip.py +++ b/hgext/strip.py @@ -13,7 +13,6 @@ error, hg, lock as lockmod, - mergestate as mergestatemod, node as nodemod, pycompat, registrar, @@ -269,7 +268,7 @@ repo.dirstate.write(repo.currenttransaction()) # clear resolve state - mergestatemod.mergestate.clean(repo, repo[b'.'].node()) + repo[None].mergestate(clean=True) update = False