Patchwork [2,of,4,V2,mergedriver] strip: switch to mergestate.clean()

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 18, 2015, 1:13 a.m.
Message ID <8f3c56092848bc43af8e.1447809204@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11455/
State Accepted
Headers show

Comments

Siddharth Agarwal - Nov. 18, 2015, 1:13 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447808555 28800
#      Tue Nov 17 17:02:35 2015 -0800
# Node ID 8f3c56092848bc43af8eebbe824056898ccfa002
# Parent  681b710bd541703659aec3ac3c9a5b7b0d6e9493
strip: switch to mergestate.clean()

See the previous patches for why we're doing this.

Patch

diff --git a/hgext/strip.py b/hgext/strip.py
--- a/hgext/strip.py
+++ b/hgext/strip.py
@@ -208,8 +208,7 @@  def stripcmd(ui, repo, *revs, **opts):
             repo.dirstate.write(repo.currenttransaction())
 
             # clear resolve state
-            ms = merge.mergestate(repo)
-            ms.reset(repo['.'].node())
+            merge.mergestate.clean(repo, repo['.'].node())
 
             update = False