equal
deleted
inserted
replaced
157 o 4:98065434e5c6 add cE |
157 o 4:98065434e5c6 add cE |
158 | |
158 | |
159 o 0:54ccbc537fc2 add cA |
159 o 0:54ccbc537fc2 add cA |
160 |
160 |
161 $ hg phase --public 7 |
161 $ hg phase --public 7 |
|
162 1 new bumped changesets |
162 $ hg strip 9 |
163 $ hg strip 9 |
163 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
164 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
164 working directory now at cf5c4f4554ce |
165 working directory now at cf5c4f4554ce |
165 1 changesets pruned |
166 1 changesets pruned |
166 $ hg log -G |
167 $ hg log -G |
844 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
845 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
845 $ mkcommit Dl |
846 $ mkcommit Dl |
846 created new head |
847 created new head |
847 $ mkcommit Dp |
848 $ mkcommit Dp |
848 $ mkcommit Do |
849 $ mkcommit Do |
849 $ hg log -G -r "25::" |
850 $ hg log -G -r "71eb4f100663::" |
850 @ 30:b517facce1ef add Do |
851 @ 30:b517facce1ef add Do |
851 | |
852 | |
852 o 29:c5a47ab27c2e add Dp |
853 o 29:c5a47ab27c2e add Dp |
853 | |
854 | |
854 o 28:8c1c2edbaf1b add Dl |
855 o 28:8c1c2edbaf1b add Dl |
856 | o 27:1192fa9fbc68 add Dk |
857 | o 27:1192fa9fbc68 add Dk |
857 |/ |
858 |/ |
858 o 25:71eb4f100663 add pk |
859 o 25:71eb4f100663 add pk |
859 | |
860 | |
860 ~ |
861 ~ |
861 $ hg prune 28 -s 27 |
862 $ hg prune 8c1c2edbaf1b -s 1192fa9fbc68 |
862 1 changesets pruned |
863 1 changesets pruned |
863 $ hg up 25 |
864 $ hg up 71eb4f100663 |
864 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
865 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
865 $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True |
866 $ hg rebase -r "8c1c2edbaf1b + c5a47ab27c2e" --keep -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True |
866 note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk" |
867 note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk" |
867 rebasing 29:c5a47ab27c2e "add Dp" |
868 rebasing 29:c5a47ab27c2e "add Dp" |
868 $ hg log -G -r "25::" |
869 $ hg log -G -r "71eb4f100663::" |
869 o 31:7d8affb1f604 add Dp |
870 o 31:7d8affb1f604 add Dp |
870 | |
871 | |
871 | o 30:b517facce1ef add Do |
872 | o 30:b517facce1ef add Do |
872 | | |
873 | | |
873 | o 29:c5a47ab27c2e add Dp |
874 | o 29:c5a47ab27c2e add Dp |
881 ~ |
882 ~ |
882 |
883 |
883 Rebase the same stack in full on the destination, we expect it to disappear |
884 Rebase the same stack in full on the destination, we expect it to disappear |
884 and only see the top revision added to destination. We don\'t expect 29 to be |
885 and only see the top revision added to destination. We don\'t expect 29 to be |
885 skipped as we used --keep before. |
886 skipped as we used --keep before. |
886 $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True |
887 $ hg rebase -s 8c1c2edbaf1b -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True |
887 note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk" |
888 note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk" |
888 rebasing 29:c5a47ab27c2e "add Dp" |
889 rebasing 29:c5a47ab27c2e "add Dp" |
889 rebasing 30:b517facce1ef "add Do" |
890 rebasing 30:b517facce1ef "add Do" |
890 $ hg log -G -r "25::" |
891 $ hg log -G -r "71eb4f100663::" |
891 o 32:1d43fff9e26f add Do |
892 o 32:1d43fff9e26f add Do |
892 | |
893 | |
893 o 31:7d8affb1f604 add Dp |
894 o 31:7d8affb1f604 add Dp |
894 | |
895 | |
895 o 27:1192fa9fbc68 add Dk |
896 o 27:1192fa9fbc68 add Dk |