From 7e0e958b67314bd7242e7506eeeafe039307b249 Mon Sep 17 00:00:00 2001 From: Siddharth Agarwal Date: Tue, 17 Nov 2015 17:04:32 -0800 Subject: [PATCH] localrepo: switch to mergestate.clean() See the previous patches for why we're doing this. --- mercurial/localrepo.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py index a0c82b61c5..0f9fc59e4a 100644 --- 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