equal
deleted
inserted
replaced
683 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all |
683 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all |
684 $ hg rebase -d 6 -r "4::" |
684 $ hg rebase -d 6 -r "4::" |
685 rebasing 4:ff2c4d47b71d "C" |
685 rebasing 4:ff2c4d47b71d "C" |
686 note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
686 note: not rebasing 7:360bbaa7d3ce "O", it has no successor |
687 rebasing 8:8d47583e023f "P" (tip) |
687 rebasing 8:8d47583e023f "P" (tip) |
|
688 |
|
689 If all the changeset to be rebased are obsolete and present in the destination, we |
|
690 should display a friendly error message |
|
691 |
|
692 $ hg log -G |
|
693 @ 10:121d9e3bc4c6 P |
|
694 | |
|
695 o 9:4be60e099a77 C |
|
696 | |
|
697 o 6:9c48361117de D |
|
698 | |
|
699 o 2:261e70097290 B2 |
|
700 | |
|
701 o 0:4a2df7238c3b A |
|
702 |
|
703 |
|
704 $ hg up 9 |
|
705 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
706 $ echo "non-relevant change" > nonrelevant |
|
707 $ hg add nonrelevant |
|
708 $ hg commit -m nonrelevant |
|
709 created new head |
|
710 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all |
|
711 $ hg rebase -r . -d 10 |
|
712 abort: all requested changesets have equivalents or were marked as obsolete |
|
713 (to force the rebase, set the config experimental.rebaseskipobsolete to False) |
|
714 [255] |