# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2015-04-16 23:48:20
# Node ID 59406b8b13039ebc4c501a105b22341c18e8abb2
# Parent  a7f8e3584ef3e37c78bfbf9c934e16eea89dabf7

rollback: clear resolve state (issue4593)

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -1092,6 +1092,9 @@ class localrepository(object):
             else:
                 ui.status(_('working directory now based on '
                             'revision %d\n') % parents)
+            ms = mergemod.mergestate(self)
+            ms.reset(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
         # invalidated.