equal
deleted
inserted
replaced
469 | | |
469 | | |
470 o | 4:9520eea781bc E |
470 o | 4:9520eea781bc E |
471 |/ |
471 |/ |
472 o 0:cd010b8cd998 A |
472 o 0:cd010b8cd998 A |
473 |
473 |
|
474 $ cd .. |
|
475 |
|
476 Detach both parents |
|
477 |
|
478 $ hg init double-detach |
|
479 $ cd double-detach |
|
480 |
|
481 $ hg debugdrawdag <<EOF |
|
482 > F |
|
483 > /| |
|
484 > C E |
|
485 > | | |
|
486 > B D G |
|
487 > \|/ |
|
488 > A |
|
489 > EOF |
|
490 |
|
491 BROKEN: This raises an exception |
|
492 $ hg rebase -d G -r 'B + D + F' 2>&1 | grep '^AssertionError' |
|
493 AssertionError: no base found to rebase on (defineparents called wrong) |
|
494 |
474 $ cd .. |
495 $ cd .. |
475 |
496 |
476 test on rebase dropping a merge |
497 test on rebase dropping a merge |
477 |
498 |
478 (setup) |
499 (setup) |