Show More
@@ -441,8 +441,10 b' class rebaseruntime(object):' | |||||
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: |
General Comments 0
You need to be logged in to leave comments.
Login now