Mercurial > public > mercurial-scm > hg

diff hgext/strip.py @ 26988:7e38d49bc713

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip: switch to mergestate.clean() See the previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 17:02:35 -0800
parents 4b0c3df5d635
children 8279c5d116a0
line wrap: on
line diff
--- 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