localrepo: switch to mergestate.clean()
See the previous patches for why we're doing this.
--- 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