Show More
@@ -368,6 +368,8 b' class rebaseruntime(object):' | |||
|
368 | 368 | self.resume = True |
|
369 | 369 | try: |
|
370 | 370 | self.restorestatus() |
|
371 | # Calculate self.obsoletenotrebased | |
|
372 | self._handleskippingobsolete() | |
|
371 | 373 | self.collapsemsg = restorecollapsemsg(self.repo, isabort) |
|
372 | 374 | except error.RepoLookupError: |
|
373 | 375 | if isabort: |
@@ -434,6 +436,9 b' class rebaseruntime(object):' | |||
|
434 | 436 | |
|
435 | 437 | self.prepared = True |
|
436 | 438 | |
|
439 | # Calculate self.obsoletenotrebased | |
|
440 | self._handleskippingobsolete() | |
|
441 | ||
|
437 | 442 | def _assignworkingcopy(self): |
|
438 | 443 | if self.inmemory: |
|
439 | 444 | from mercurial.context import overlayworkingctx |
@@ -467,9 +472,6 b' class rebaseruntime(object):' | |||
|
467 | 472 | _(b'cannot collapse multiple named branches') |
|
468 | 473 | ) |
|
469 | 474 | |
|
470 | # Calculate self.obsoletenotrebased | |
|
471 | self._handleskippingobsolete() | |
|
472 | ||
|
473 | 475 | # Keep track of the active bookmarks in order to reset them later |
|
474 | 476 | self.activebookmark = self.activebookmark or repo._activebookmark |
|
475 | 477 | if self.activebookmark: |
General Comments 0
You need to be logged in to leave comments.
Login now