Show More
@@ -362,10 +362,7 b' class rebaseruntime(object):' | |||||
362 | skippedset = set(self.obsolete_with_successor_in_destination) |
|
362 | skippedset = set(self.obsolete_with_successor_in_destination) | |
363 | skippedset.update(self.obsolete_with_successor_in_rebase_set) |
|
363 | skippedset.update(self.obsolete_with_successor_in_rebase_set) | |
364 | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) |
|
364 | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | |
365 | allowdivergence = self.ui.configbool( |
|
365 | if obsolete.isenabled(self.repo, obsolete.allowdivergenceopt): | |
366 | b'experimental', b'evolution.allowdivergence' |
|
|||
367 | ) |
|
|||
368 | if allowdivergence: |
|
|||
369 | self.obsolete_with_successor_in_rebase_set = set() |
|
366 | self.obsolete_with_successor_in_rebase_set = set() | |
370 | else: |
|
367 | else: | |
371 | for rev in self.repo.revs( |
|
368 | for rev in self.repo.revs( | |
@@ -1652,7 +1649,7 b' def _checkobsrebase(repo, ui, rebaseobsr' | |||||
1652 | successors in destination or no non-obsolete successor. |
|
1649 | successors in destination or no non-obsolete successor. | |
1653 | """ |
|
1650 | """ | |
1654 | # Obsolete node with successors not in dest leads to divergence |
|
1651 | # Obsolete node with successors not in dest leads to divergence | |
1655 |
divergenceok = |
|
1652 | divergenceok = obsolete.isenabled(repo, obsolete.allowdivergenceopt) | |
1656 | divergencebasecandidates = rebaseobsrevs - rebaseobsskipped |
|
1653 | divergencebasecandidates = rebaseobsrevs - rebaseobsskipped | |
1657 |
|
1654 | |||
1658 | if divergencebasecandidates and not divergenceok: |
|
1655 | if divergencebasecandidates and not divergenceok: |
General Comments 0
You need to be logged in to leave comments.
Login now