Show More
@@ -1891,7 +1891,7 b' def _computeobsoletenotrebased(repo, reb' | |||||
1891 | # If 'srcrev' has a successor in rebase set but none in |
|
1891 | # If 'srcrev' has a successor in rebase set but none in | |
1892 | # destination (which would be catched above), we shall skip it |
|
1892 | # destination (which would be catched above), we shall skip it | |
1893 | # and its descendants to avoid divergence. |
|
1893 | # and its descendants to avoid divergence. | |
1894 | if any(s in destmap for s in succrevs): |
|
1894 | if srcrev in extinctrevs or any(s in destmap for s in succrevs): | |
1895 | obsoletewithoutsuccessorindestination.add(srcrev) |
|
1895 | obsoletewithoutsuccessorindestination.add(srcrev) | |
1896 |
|
1896 | |||
1897 | return ( |
|
1897 | return ( |
@@ -1525,11 +1525,9 b' destination' | |||||
1525 | > A |
|
1525 | > A | |
1526 | > EOF |
|
1526 | > EOF | |
1527 |
|
1527 | |||
1528 | TODO: There doesn't seem to be much reason to fail this rebase. Make it pass? |
|
|||
1529 | $ hg rebase -d D -s B |
|
1528 | $ hg rebase -d D -s B | |
1530 | abort: this rebase will cause divergences from: 26805aba1e60 |
|
1529 | rebasing 1:112478962961 "B" (B) | |
1531 | (to force the rebase please set experimental.evolution.allowdivergence=True) |
|
1530 | note: not rebasing 3:26805aba1e60 "C" (C) and its descendants as this would cause divergence | |
1532 | [255] |
|
|||
1533 |
|
1531 | |||
1534 | $ cd .. |
|
1532 | $ cd .. | |
1535 |
|
1533 |
General Comments 0
You need to be logged in to leave comments.
Login now