equal
deleted
inserted
replaced
493 | |
493 | |
494 o 4:98065434e5c6 add cE |
494 o 4:98065434e5c6 add cE |
495 | |
495 | |
496 o 0:54ccbc537fc2 add cA |
496 o 0:54ccbc537fc2 add cA |
497 |
497 |
498 |
498 Check that rebasing a commit twice makes the commit visible again |
|
499 |
|
500 $ hg rebase -d 18 -r 16 --keep |
|
501 rebasing 16:a438c045eb37 "add cN" |
|
502 $ hg log -r 14:: -G |
|
503 o 19:104eed5354c7 add cN |
|
504 | |
|
505 @ 18:210589181b14 add cM |
|
506 | |
|
507 | o 16:a438c045eb37 add cN |
|
508 | | |
|
509 | o 15:2d66e189f5b5 add cM |
|
510 |/ |
|
511 o 14:d66ccb8c5871 add cL |
|
512 | |
|
513 $ hg prune -r 104eed5354c7 |
|
514 1 changesets pruned |
|
515 $ hg rebase -d 18 -r 16 --keep |
|
516 rebasing 16:a438c045eb37 "add cN" |
|
517 $ hg log -r 14:: -G |
|
518 o 19:104eed5354c7 add cN |
|
519 | |
|
520 @ 18:210589181b14 add cM |
|
521 | |
|
522 | o 16:a438c045eb37 add cN |
|
523 | | |
|
524 | o 15:2d66e189f5b5 add cM |
|
525 |/ |
|
526 o 14:d66ccb8c5871 add cL |
|
527 | |
|
528 $ hg prune -r 104eed5354c7 |
|
529 1 changesets pruned |