Show More
@@ -447,11 +447,11 b' class rebaseruntime(object):' | |||||
447 | if dest.closesbranch() and not self.keepbranchesf: |
|
447 | if dest.closesbranch() and not self.keepbranchesf: | |
448 | self.ui.status(_(b'reopening closed branch head %s\n') % dest) |
|
448 | self.ui.status(_(b'reopening closed branch head %s\n') % dest) | |
449 |
|
449 | |||
450 | self.prepared = True |
|
|||
451 |
|
||||
452 | # Calculate self.obsolete_* sets |
|
450 | # Calculate self.obsolete_* sets | |
453 | self._handleskippingobsolete() |
|
451 | self._handleskippingobsolete() | |
454 |
|
452 | |||
|
453 | self.prepared = True | |||
|
454 | ||||
455 | def _assignworkingcopy(self): |
|
455 | def _assignworkingcopy(self): | |
456 | if self.inmemory: |
|
456 | if self.inmemory: | |
457 | from mercurial.context import overlayworkingctx |
|
457 | from mercurial.context import overlayworkingctx | |
@@ -2192,7 +2192,6 b' def _compute_obsolete_sets(repo, rebaseo' | |||||
2192 | obsolete_with_successor_in_destination = {} |
|
2192 | obsolete_with_successor_in_destination = {} | |
2193 | obsolete_with_successor_in_rebase_set = set() |
|
2193 | obsolete_with_successor_in_rebase_set = set() | |
2194 |
|
2194 | |||
2195 | assert repo.filtername is None |
|
|||
2196 | cl = repo.changelog |
|
2195 | cl = repo.changelog | |
2197 | get_rev = cl.index.get_rev |
|
2196 | get_rev = cl.index.get_rev | |
2198 | extinctrevs = set(repo.revs(b'extinct()')) |
|
2197 | extinctrevs = set(repo.revs(b'extinct()')) |
General Comments 0
You need to be logged in to leave comments.
Login now