diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -368,6 +368,8 @@ self.resume = True try: self.restorestatus() + # Calculate self.obsoletenotrebased + self._handleskippingobsolete() self.collapsemsg = restorecollapsemsg(self.repo, isabort) except error.RepoLookupError: if isabort: @@ -434,6 +436,9 @@ self.prepared = True + # Calculate self.obsoletenotrebased + self._handleskippingobsolete() + def _assignworkingcopy(self): if self.inmemory: from mercurial.context import overlayworkingctx @@ -467,9 +472,6 @@ _(b'cannot collapse multiple named branches') ) - # Calculate self.obsoletenotrebased - self._handleskippingobsolete() - # Keep track of the active bookmarks in order to reset them later self.activebookmark = self.activebookmark or repo._activebookmark if self.activebookmark: