944 (branch merge, don't forget to commit) |
944 (branch merge, don't forget to commit) |
945 $ echo "extra-change to (formelly h) during the merge" > d |
945 $ echo "extra-change to (formelly h) during the merge" > d |
946 $ hg ci -m "mFB-change-m-0 $case_desc - the other way" |
946 $ hg ci -m "mFB-change-m-0 $case_desc - the other way" |
947 created new head |
947 created new head |
948 $ hg manifest --rev . --debug | grep " d" |
948 $ hg manifest --rev . --debug | grep " d" |
949 1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset missing-correct-output !) |
949 1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !) |
950 646ed7992dec41eb29635ab28268e7867d0e59a0 644 d (no-changeset known-bad-output !) |
|
951 cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !) |
950 cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !) |
952 #if no-changeset |
951 #if no-changeset |
953 $ hg debugindex d | ../no-linkrev |
952 $ hg debugindex d | ../no-linkrev |
954 rev linkrev nodeid p1 p2 |
953 rev linkrev nodeid p1 p2 |
955 0 * d8252ab2e760 000000000000 000000000000 |
954 0 * d8252ab2e760 000000000000 000000000000 |
959 4 * 06dabf50734c b004912a8510 17ec97e60577 |
958 4 * 06dabf50734c b004912a8510 17ec97e60577 |
960 5 * 19c0e3924691 17ec97e60577 b004912a8510 |
959 5 * 19c0e3924691 17ec97e60577 b004912a8510 |
961 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 |
960 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 |
962 7 * d55cb4e9ef57 000000000000 000000000000 |
961 7 * d55cb4e9ef57 000000000000 000000000000 |
963 8 * 1c334238bd42 7b79e2fe0c89 000000000000 |
962 8 * 1c334238bd42 7b79e2fe0c89 000000000000 |
964 9 * 646ed7992dec 7b79e2fe0c89 d8252ab2e760 (known-bad-output !) |
|
965 #else |
963 #else |
966 $ hg debugindex d | ../no-linkrev |
964 $ hg debugindex d | ../no-linkrev |
967 rev linkrev nodeid p1 p2 |
965 rev linkrev nodeid p1 p2 |
968 0 * ae258f702dfe 000000000000 000000000000 |
966 0 * ae258f702dfe 000000000000 000000000000 |
969 1 * b004912a8510 000000000000 000000000000 |
967 1 * b004912a8510 000000000000 000000000000 |
1915 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !) |
1913 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !) |
1916 merged : d, ; (upgraded-parallel known-bad-output !) |
1914 merged : d, ; (upgraded-parallel known-bad-output !) |
1917 ##### revision "mFB-change-m-0 merge with extra change - B side" ##### |
1915 ##### revision "mFB-change-m-0 merge with extra change - B side" ##### |
1918 1 sidedata entries |
1916 1 sidedata entries |
1919 entry-0014 size 14 |
1917 entry-0014 size 14 |
1920 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (known-bad-output !) |
1918 '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !) |
1921 merged : d, ; (known-bad-output !) |
1919 touched : d, ; (no-upgraded no-upgraded-parallel !) |
1922 '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (missing-correct-output !) |
1920 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !) |
1923 touched : d, ; (missing-correct-output !) |
1921 merged : d, ; (upgraded-parallel known-bad-output !) |
|
1922 '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !) |
|
1923 merged : d, ; (upgraded known-bad-output !) |
1924 ##### revision "j-1" ##### |
1924 ##### revision "j-1" ##### |
1925 1 sidedata entries |
1925 1 sidedata entries |
1926 entry-0014 size 24 |
1926 entry-0014 size 24 |
1927 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' |
1927 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' |
1928 added : unrelated-j, ; |
1928 added : unrelated-j, ; |
3420 |\ |
3414 |\ |
3421 o : f-2: rename i -> d |
3415 o : f-2: rename i -> d |
3422 | : |
3416 | : |
3423 o : f-1: rename h -> i |
3417 o : f-1: rename h -> i |
3424 :/ |
3418 :/ |
3425 o i-2: c -move-> d, s -move-> t (known-bad-output !) |
|
3426 | (known-bad-output !) |
|
3427 o i-1: a -move-> c, p -move-> s (known-bad-output !) |
|
3428 | (known-bad-output !) |
|
3429 o i-0 initial commit: a b h p q r |
3419 o i-0 initial commit: a b h p q r |
3430 |
3420 |
3431 #else |
3421 #else |
3432 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
3422 BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
3433 $ hg log -Gfr 'desc("mFB-change-m-0")' d |
3423 $ hg log -Gfr 'desc("mFB-change-m-0")' d |