Show More
@@ -1092,6 +1092,9 b' class localrepository(object):' | |||||
1092 | else: |
|
1092 | else: | |
1093 | ui.status(_('working directory now based on ' |
|
1093 | ui.status(_('working directory now based on ' | |
1094 | 'revision %d\n') % parents) |
|
1094 | 'revision %d\n') % parents) | |
|
1095 | ms = mergemod.mergestate(self) | |||
|
1096 | ms.reset(self['.'].node()) | |||
|
1097 | ||||
1095 | # TODO: if we know which new heads may result from this rollback, pass |
|
1098 | # TODO: if we know which new heads may result from this rollback, pass | |
1096 | # them to destroy(), which will prevent the branchhead cache from being |
|
1099 | # them to destroy(), which will prevent the branchhead cache from being | |
1097 | # invalidated. |
|
1100 | # invalidated. |
General Comments 0
You need to be logged in to leave comments.
Login now