Show More
@@ -1511,6 +1511,28 b' Rebase merge where successor of other pa' | |||||
1511 |
|
1511 | |||
1512 | $ cd .. |
|
1512 | $ cd .. | |
1513 |
|
1513 | |||
|
1514 | Rebase merge where extinct node has successor that is not an ancestor of | |||
|
1515 | destination | |||
|
1516 | ||||
|
1517 | $ hg init extinct-with-succ-not-in-dest | |||
|
1518 | $ cd extinct-with-succ-not-in-dest | |||
|
1519 | ||||
|
1520 | $ hg debugdrawdag <<EOF | |||
|
1521 | > E C # replace: C -> E | |||
|
1522 | > | | | |||
|
1523 | > D B | |||
|
1524 | > |/ | |||
|
1525 | > A | |||
|
1526 | > EOF | |||
|
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 | |||
|
1530 | abort: this rebase will cause divergences from: 26805aba1e60 | |||
|
1531 | (to force the rebase please set experimental.evolution.allowdivergence=True) | |||
|
1532 | [255] | |||
|
1533 | ||||
|
1534 | $ cd .. | |||
|
1535 | ||||
1514 | $ hg init p2-succ-in-dest-c |
|
1536 | $ hg init p2-succ-in-dest-c | |
1515 | $ cd p2-succ-in-dest-c |
|
1537 | $ cd p2-succ-in-dest-c | |
1516 |
|
1538 |
General Comments 0
You need to be logged in to leave comments.
Login now