Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 45086:ab33782deb84
rebase: add test case that shows that inmemory rebase does not preserve merges
Differential Revision: https://phab.mercurial-scm.org/D8727
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Fri, 10 Jul 2020 01:36:19 +0200 |
parents | 905b21783968 |
children | 0ecb3b11fcad |
comparison
equal
deleted
inserted
replaced
45085:a0192a03216d | 45086:ab33782deb84 |
---|---|
918 | | some_other_file | 918 | | some_other_file |
919 o | 1: hi from foo | 919 o | 1: hi from foo |
920 |/ foo | 920 |/ foo |
921 o 0: r0 | 921 o 0: r0 |
922 r0 | 922 r0 |
923 | |
924 $ cd .. | |
925 | |
926 Changesets that become empty should not be committed. Merges are not empty by | |
927 definition. | |
928 | |
929 $ hg init keep_merge | |
930 $ cd keep_merge | |
931 $ echo base > base; hg add base; hg ci -m base | |
932 $ echo test > test; hg add test; hg ci -m a | |
933 $ hg up 0 -q | |
934 $ echo test > test; hg add test; hg ci -m b -q | |
935 $ hg up 0 -q | |
936 $ echo test > test; hg add test; hg ci -m c -q | |
937 $ hg up 1 -q | |
938 $ hg merge 2 -q | |
939 $ hg ci -m merge | |
940 $ hg up null -q | |
941 $ hg tglog | |
942 o 4: 59c8292117b1 'merge' | |
943 |\ | |
944 | | o 3: 531f80391e4a 'c' | |
945 | | | | |
946 | o | 2: 0194f1db184a 'b' | |
947 | |/ | |
948 o / 1: 6f252845ea45 'a' | |
949 |/ | |
950 o 0: d20a80d4def3 'base' | |
951 | |
952 FIXME: It's broken for inmemory merges. | |
953 $ hg rebase -s 2 -d 3 | |
954 rebasing 2:0194f1db184a "b" | |
955 note: not rebasing 2:0194f1db184a "b", its destination already has all its changes | |
956 rebasing 4:59c8292117b1 "merge" (tip) | |
957 note: not rebasing 4:59c8292117b1 "merge" (tip), its destination already has all its changes (true !) | |
958 saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/0194f1db184a-aee31d03-rebase.hg | |
959 #if false | |
960 $ hg tglog | |
961 o 3: 506e2454484b 'merge' | |
962 |\ | |
963 | o 2: 531f80391e4a 'c' | |
964 | | | |
965 o | 1: 6f252845ea45 'a' | |
966 |/ | |
967 o 0: d20a80d4def3 'base' | |
968 | |
969 #endif |