# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-18 01:04:32
# Node ID a65ea44f163e589051e69d3c62569c17365fb0d7
# Parent  7e38d49bc713f4a4d4c37063bced6b1a1b39ecc2

localrepo: switch to mergestate.clean()

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

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