equal
deleted
inserted
replaced
1090 ui.status(_('working directory now based on ' |
1090 ui.status(_('working directory now based on ' |
1091 'revisions %d and %d\n') % parents) |
1091 'revisions %d and %d\n') % parents) |
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. |
1098 self.destroyed() |
1101 self.destroyed() |
1099 return 0 |
1102 return 0 |