diff -r a108f7ff7778 -r 0ce6af73f481 mercurial/localrepo.py --- a/mercurial/localrepo.py Thu Sep 17 09:56:05 2020 -0700 +++ b/mercurial/localrepo.py Tue Sep 15 22:40:26 2020 -0700 @@ -2516,7 +2516,7 @@ ui.status( _(b'working directory now based on revision %d\n') % parents ) - mergestatemod.mergestate.clean(self, self[b'.'].node()) + mergestatemod.mergestate.clean(self) # TODO: if we know which new heads may result from this rollback, pass # them to destroy(), which will prevent the branchhead cache from being