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

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

Comments

Siddharth Agarwal - Nov. 18, 2015, 1:13 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447808672 28800
#      Tue Nov 17 17:04:32 2015 -0800
# Node ID 0177a83b0a029bc9ea5d062611448b885a409dcb
# Parent  8f3c56092848bc43af8eebbe824056898ccfa002
localrepo: switch to mergestate.clean()

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

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1168,8 +1168,7 @@  class localrepository(object):
             else:
                 ui.status(_('working directory now based on '
                             'revision %d\n') % parents)
-            ms = mergemod.mergestate(self)
-            ms.reset(self['.'].node())
+            mergemod.mergestate.clean(self, self['.'].node())
 
         # TODO: if we know which new heads may result from this rollback, pass
         # them to destroy(), which will prevent the branchhead cache from being