equal
deleted
inserted
replaced
444 |
444 |
445 if not self.keepf: |
445 if not self.keepf: |
446 rebaseset = set(destmap.keys()) |
446 rebaseset = set(destmap.keys()) |
447 rebaseset -= set(self.obsolete_with_successor_in_destination) |
447 rebaseset -= set(self.obsolete_with_successor_in_destination) |
448 rebaseset -= self.obsolete_with_successor_in_rebase_set |
448 rebaseset -= self.obsolete_with_successor_in_rebase_set |
|
449 # We have our own divergence-checking in the rebase extension |
|
450 overrides = {} |
|
451 if obsolete.isenabled(self.repo, obsolete.createmarkersopt): |
|
452 overrides = { |
|
453 (b'experimental', b'evolution.allowdivergence'): b'true' |
|
454 } |
449 try: |
455 try: |
450 rewriteutil.precheck(self.repo, rebaseset, action=b'rebase') |
456 with self.ui.configoverride(overrides): |
|
457 rewriteutil.precheck(self.repo, rebaseset, action=b'rebase') |
451 except error.Abort as e: |
458 except error.Abort as e: |
452 if e.hint is None: |
459 if e.hint is None: |
453 e.hint = _(b'use --keep to keep original changesets') |
460 e.hint = _(b'use --keep to keep original changesets') |
454 raise e |
461 raise e |
455 |
462 |