# HG changeset patch # User Siddharth Agarwal # Date 2015-11-18 01:02:35 # Node ID 7e38d49bc713f4a4d4c37063bced6b1a1b39ecc2 # Parent 416b2b7d30689f8b51034d3b75407f619841b350 strip: switch to mergestate.clean() See the previous patches for why we're doing this. 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