Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip: switch to mergestate.clean()
authorSiddharth Agarwal <sid0@fb.com>
Tue, 17 Nov 2015 17:02:35 -0800
changeset 26988 7e38d49bc713
parent 26987 416b2b7d3068
child 26989 a65ea44f163e
strip: switch to mergestate.clean() See the previous patches for why we're doing this.
hgext/strip.py file | annotate | diff | comparison | revisions 
--- a/hgext/strip.py	Tue Nov 17 17:00:54 2015 -0800
+++ b/hgext/strip.py	Tue Nov 17 17:02:35 2015 -0800
@@ -208,8 +208,7 @@
             repo.dirstate.write(repo.currenttransaction())
 
             # clear resolve state
-            ms = merge.mergestate(repo)
-            ms.reset(repo['.'].node())
+            merge.mergestate.clean(repo, repo['.'].node())
 
             update = False
hg-stable