Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 26989 a65ea44f163e
parent 26907 dfab6edb98e3
child 26996 bf3eec62212f 
--- 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
Mercurial