mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
rollback: clear resolve state (issue4593)
This commit is contained in:
parent
cd579fe2e0
commit
e8828f848c
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user