455 |
455 |
456 $ hg up null -q # to be not based on 9 anymore |
456 $ hg up null -q # to be not based on 9 anymore |
457 |
457 |
458 check rebase compat |
458 check rebase compat |
459 |
459 |
460 $ hg log -G -r 'not extinct()' --template='{rev} - {node|short}\n' |
460 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
|
461 o 8 - 159dfc9fa5d3 add obsol_d'' |
|
462 | |
|
463 | o 4 - 725c380fe99b add obsol_c' |
|
464 | | |
|
465 x | 3 - 0d3f46688ccc add obsol_c |
|
466 |/ |
|
467 o 1 - 7c3bad9141dc add b |
|
468 | |
|
469 o 0 - 1f0dee641bb7 add a |
|
470 |
|
471 |
|
472 $ hg log -G --template='{rev} - {node|short}\n' --hidden |
|
473 x 9 - 83b5778897ad |
|
474 |
461 o 8 - 159dfc9fa5d3 |
475 o 8 - 159dfc9fa5d3 |
462 | |
476 | |
|
477 | x 7 - 909a0fb57e5d |
|
478 |/ |
|
479 | x 6 - 95de7fc6918d |
|
480 |/ |
|
481 | x 5 - a7a6f2b5d8a5 |
|
482 |/ |
463 | o 4 - 725c380fe99b |
483 | o 4 - 725c380fe99b |
464 | | |
484 | | |
465 x | 3 - 0d3f46688ccc |
485 x | 3 - 0d3f46688ccc |
466 |/ |
486 |/ |
|
487 | x 2 - 4538525df7e2 |
|
488 |/ |
467 o 1 - 7c3bad9141dc |
489 o 1 - 7c3bad9141dc |
468 | |
490 | |
469 o 0 - 1f0dee641bb7 |
491 o 0 - 1f0dee641bb7 |
470 |
492 |
471 |
493 |
472 $ hg log -G --template='{rev} - {node|short}\n' --hidden |
|
473 x 9 - 83b5778897ad |
|
474 |
|
475 o 8 - 159dfc9fa5d3 |
|
476 | |
|
477 | x 7 - 909a0fb57e5d |
|
478 |/ |
|
479 | x 6 - 95de7fc6918d |
|
480 |/ |
|
481 | x 5 - a7a6f2b5d8a5 |
|
482 |/ |
|
483 | o 4 - 725c380fe99b |
|
484 | | |
|
485 x | 3 - 0d3f46688ccc |
|
486 |/ |
|
487 | x 2 - 4538525df7e2 |
|
488 |/ |
|
489 o 1 - 7c3bad9141dc |
|
490 | |
|
491 o 0 - 1f0dee641bb7 |
|
492 |
|
493 |
|
494 should not rebase extinct changeset |
494 should not rebase extinct changeset |
495 |
495 |
496 $ hg rebase -s 7 -d 4 |
496 #excluded 'whole rebase set is extinct and ignored.' message not in core |
497 whole rebase set is extinct and ignored. |
497 $ hg rebase -s 7 -d 4 2>&1 | grep -v 'whole rebase' |
498 nothing to rebase |
498 nothing to rebase |
499 [1] |
499 $ hg rebase -b '3' -d 4 --traceback |
500 $ hg rebase -b 3 -d 4 --traceback |
|
501 2 new conflicting changesets |
500 2 new conflicting changesets |
502 $ hg log -G -r 'not extinct()' --template='{rev} - {node|short}\n' |
501 $ hg log -G --template='{rev} - {node|short} {desc}\n' |
503 @ 11 - 9468a5f5d8b2 |
502 @ 11 - 9468a5f5d8b2 add obsol_d'' |
504 | |
503 | |
505 o 10 - 2033b4e49474 |
504 o 10 - 2033b4e49474 add obsol_c |
506 | |
505 | |
507 o 4 - 725c380fe99b |
506 o 4 - 725c380fe99b add obsol_c' |
508 | |
507 | |
509 o 1 - 7c3bad9141dc |
508 o 1 - 7c3bad9141dc add b |
510 | |
509 | |
511 o 0 - 1f0dee641bb7 |
510 o 0 - 1f0dee641bb7 add a |
512 |
511 |
513 |
512 |
514 Does not complain about new head if you obsolete the old one |
513 Does not complain about new head if you obsolete the old one |
515 |
514 |
516 $ hg push ../other-new --traceback |
515 $ hg push ../other-new --traceback |