equal
deleted
inserted
replaced
439 self.ui.status(_(b'reopening closed branch head %s\n') % dest) |
439 self.ui.status(_(b'reopening closed branch head %s\n') % dest) |
440 |
440 |
441 # Calculate self.obsolete_* sets |
441 # Calculate self.obsolete_* sets |
442 self._handleskippingobsolete() |
442 self._handleskippingobsolete() |
443 |
443 |
444 rebaseset = destmap.keys() |
|
445 if not self.keepf: |
444 if not self.keepf: |
|
445 rebaseset = set(destmap.keys()) |
|
446 rebaseset -= set(self.obsolete_with_successor_in_destination) |
|
447 rebaseset -= self.obsolete_with_successor_in_rebase_set |
446 try: |
448 try: |
447 rewriteutil.precheck(self.repo, rebaseset, action=b'rebase') |
449 rewriteutil.precheck(self.repo, rebaseset, action=b'rebase') |
448 except error.Abort as e: |
450 except error.Abort as e: |
449 if e.hint is None: |
451 if e.hint is None: |
450 e.hint = _(b'use --keep to keep original changesets') |
452 e.hint = _(b'use --keep to keep original changesets') |