Mercurial > hg

changeset 26989:a65ea44f163e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: 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:04:32 -0800
parents 7e38d49bc713
children 11b1832db8ae
files mercurial/localrepo.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Tue Nov 17 17:02:35 2015 -0800
+++ b/mercurial/localrepo.py	Tue Nov 17 17:04:32 2015 -0800
@@ -1168,8 +1168,7 @@
             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