Mercurial > hg-stable

changeset 24784:59406b8b1303

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback: clear resolve state (issue4593)
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Apr 2015 18:48:20 -0500
parents a7f8e3584ef3
children 39f519be5e65
files mercurial/localrepo.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu Apr 16 11:31:48 2015 -0700
+++ b/mercurial/localrepo.py	Thu Apr 16 18:48:20 2015 -0500
@@ -1092,6 +1092,9 @@
             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.