Mercurial > hg

comparison tests/test-copies-chain-merge.t @ 47128:bea4717415c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 07 May 2021 22:06:25 -0400
parents bc7bdca15e47 7383df4f6e19
children 0dedd3d063b0
comparison
equal deleted inserted replaced
47127:5ffc6c18fb96 47128:bea4717415c0
23 > print(line.rstrip()) 23 > print(line.rstrip())
24 > else: 24 > else:
25 > l = "%s *%s" % (line[:6], line[14:].rstrip()) 25 > l = "%s *%s" % (line[:6], line[14:].rstrip())
26 > print(l) 26 > print(l)
27 > EOF 27 > EOF
28 $ chmod +x no-linkrev
29 28
30 $ cat << EOF >> $HGRCPATH 29 $ cat << EOF >> $HGRCPATH
31 > [diff] 30 > [diff]
32 > git=yes 31 > git=yes
33 > [command-templates] 32 > [command-templates]
514 $ hg mv h i 513 $ hg mv h i
515 $ hg commit -m "f-1: rename h -> i" 514 $ hg commit -m "f-1: rename h -> i"
516 created new head 515 created new head
517 $ hg mv --force i d 516 $ hg mv --force i d
518 $ hg commit -m "f-2: rename i -> d" 517 $ hg commit -m "f-2: rename i -> d"
519 $ hg debugindex d | ../no-linkrev 518 $ hg debugindex d | "$PYTHON" ../no-linkrev
520 rev linkrev nodeid p1 p2 519 rev linkrev nodeid p1 p2
521 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) 520 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !)
522 0 * ae258f702dfe 000000000000 000000000000 (changeset !) 521 0 * ae258f702dfe 000000000000 000000000000 (changeset !)
523 1 * b004912a8510 000000000000 000000000000 522 1 * b004912a8510 000000000000 000000000000
524 2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !) 523 2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
570 $ hg mv r x 569 $ hg mv r x
571 $ hg commit -m "r-1: rename r -> x" 570 $ hg commit -m "r-1: rename r -> x"
572 created new head 571 created new head
573 $ hg mv --force x t 572 $ hg mv --force x t
574 $ hg commit -m "r-2: rename t -> x" 573 $ hg commit -m "r-2: rename t -> x"
575 $ hg debugindex t | ../no-linkrev 574 $ hg debugindex t | "$PYTHON" ../no-linkrev
576 rev linkrev nodeid p1 p2 575 rev linkrev nodeid p1 p2
577 0 * d74efbf65309 000000000000 000000000000 (no-changeset !) 576 0 * d74efbf65309 000000000000 000000000000 (no-changeset !)
578 1 * 02a930b9d7ad 000000000000 000000000000 (no-changeset !) 577 1 * 02a930b9d7ad 000000000000 000000000000 (no-changeset !)
579 0 * 5aed6a8dbff0 000000000000 000000000000 (changeset !) 578 0 * 5aed6a8dbff0 000000000000 000000000000 (changeset !)
580 1 * a38b2fa17021 000000000000 000000000000 (changeset !) 579 1 * a38b2fa17021 000000000000 000000000000 (changeset !)
937 $ case_desc="merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)" 936 $ case_desc="merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)"
938 937
939 $ hg up 'desc("f-2")' 938 $ hg up 'desc("f-2")'
940 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 939 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
941 #if no-changeset 940 #if no-changeset
942 $ hg debugindex d | ../no-linkrev 941 $ hg debugindex d | "$PYTHON" ../no-linkrev
943 rev linkrev nodeid p1 p2 942 rev linkrev nodeid p1 p2
944 0 * d8252ab2e760 000000000000 000000000000 943 0 * d8252ab2e760 000000000000 000000000000
945 1 * b004912a8510 000000000000 000000000000 944 1 * b004912a8510 000000000000 000000000000
946 2 * 7b79e2fe0c89 000000000000 000000000000 945 2 * 7b79e2fe0c89 000000000000 000000000000
947 3 * 17ec97e60577 d8252ab2e760 000000000000 946 3 * 17ec97e60577 d8252ab2e760 000000000000
948 4 * 06dabf50734c b004912a8510 17ec97e60577 947 4 * 06dabf50734c b004912a8510 17ec97e60577
949 5 * 19c0e3924691 17ec97e60577 b004912a8510 948 5 * 19c0e3924691 17ec97e60577 b004912a8510
950 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 949 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577
951 7 * d55cb4e9ef57 000000000000 000000000000 950 7 * d55cb4e9ef57 000000000000 000000000000
952 #else 951 #else
953 $ hg debugindex d | ../no-linkrev 952 $ hg debugindex d | "$PYTHON" ../no-linkrev
954 rev linkrev nodeid p1 p2 953 rev linkrev nodeid p1 p2
955 0 * ae258f702dfe 000000000000 000000000000 954 0 * ae258f702dfe 000000000000 000000000000
956 1 * b004912a8510 000000000000 000000000000 955 1 * b004912a8510 000000000000 000000000000
957 2 * 5cce88bf349f ae258f702dfe 000000000000 956 2 * 5cce88bf349f ae258f702dfe 000000000000
958 3 * cc269dd788c8 b004912a8510 5cce88bf349f 957 3 * cc269dd788c8 b004912a8510 5cce88bf349f
982 created new head 981 created new head
983 $ hg manifest --rev . --debug | grep " d" 982 $ hg manifest --rev . --debug | grep " d"
984 1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !) 983 1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !)
985 cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !) 984 cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !)
986 #if no-changeset 985 #if no-changeset
987 $ hg debugindex d | ../no-linkrev 986 $ hg debugindex d | "$PYTHON" ../no-linkrev
988 rev linkrev nodeid p1 p2 987 rev linkrev nodeid p1 p2
989 0 * d8252ab2e760 000000000000 000000000000 988 0 * d8252ab2e760 000000000000 000000000000
990 1 * b004912a8510 000000000000 000000000000 989 1 * b004912a8510 000000000000 000000000000
991 2 * 7b79e2fe0c89 000000000000 000000000000 990 2 * 7b79e2fe0c89 000000000000 000000000000
992 3 * 17ec97e60577 d8252ab2e760 000000000000 991 3 * 17ec97e60577 d8252ab2e760 000000000000
994 5 * 19c0e3924691 17ec97e60577 b004912a8510 993 5 * 19c0e3924691 17ec97e60577 b004912a8510
995 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 994 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577
996 7 * d55cb4e9ef57 000000000000 000000000000 995 7 * d55cb4e9ef57 000000000000 000000000000
997 8 * 1c334238bd42 7b79e2fe0c89 000000000000 996 8 * 1c334238bd42 7b79e2fe0c89 000000000000
998 #else 997 #else
999 $ hg debugindex d | ../no-linkrev 998 $ hg debugindex d | "$PYTHON" ../no-linkrev
1000 rev linkrev nodeid p1 p2 999 rev linkrev nodeid p1 p2
1001 0 * ae258f702dfe 000000000000 000000000000 1000 0 * ae258f702dfe 000000000000 000000000000
1002 1 * b004912a8510 000000000000 000000000000 1001 1 * b004912a8510 000000000000 000000000000
1003 2 * 5cce88bf349f ae258f702dfe 000000000000 1002 2 * 5cce88bf349f ae258f702dfe 000000000000
1004 3 * cc269dd788c8 b004912a8510 5cce88bf349f 1003 3 * cc269dd788c8 b004912a8510 5cce88bf349f
2435 $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d' 2434 $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d'
2436 b004912a8510032a0350a74daa2803dadfb00e12 644 d 2435 b004912a8510032a0350a74daa2803dadfb00e12 644 d
2437 $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' 2436 $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d'
2438 d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !) 2437 d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !)
2439 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !) 2438 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !)
2440 $ hg debugindex d | head -n 4 | ../no-linkrev 2439 $ hg debugindex d | head -n 4 | "$PYTHON" ../no-linkrev
2441 rev linkrev nodeid p1 p2 2440 rev linkrev nodeid p1 p2
2442 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) 2441 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !)
2443 0 * ae258f702dfe 000000000000 000000000000 (changeset !) 2442 0 * ae258f702dfe 000000000000 000000000000 (changeset !)
2444 1 * b004912a8510 000000000000 000000000000 2443 1 * b004912a8510 000000000000 000000000000
2445 2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !) 2444 2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
2508 2ff93c643948464ee1f871867910ae43a45b0bea 644 f 2507 2ff93c643948464ee1f871867910ae43a45b0bea 644 f
2509 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' 2508 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
2510 b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f 2509 b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f
2511 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' 2510 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
2512 e8825b386367b29fec957283a80bb47b47483fe1 644 f 2511 e8825b386367b29fec957283a80bb47b47483fe1 644 f
2513 $ hg debugindex f | ../no-linkrev 2512 $ hg debugindex f | "$PYTHON" ../no-linkrev
2514 rev linkrev nodeid p1 p2 2513 rev linkrev nodeid p1 p2
2515 0 * b76eb76580df 000000000000 000000000000 2514 0 * b76eb76580df 000000000000 000000000000
2516 1 * e8825b386367 000000000000 000000000000 2515 1 * e8825b386367 000000000000 000000000000
2517 2 * 2ff93c643948 b76eb76580df e8825b386367 2516 2 * 2ff93c643948 b76eb76580df e8825b386367
2518 3 * 2f649fba7eb2 b76eb76580df e8825b386367 2517 3 * 2f649fba7eb2 b76eb76580df e8825b386367
2524 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f 2523 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
2525 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' 2524 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
2526 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f 2525 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
2527 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' 2526 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
2528 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f 2527 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
2529 $ hg debugindex f | ../no-linkrev 2528 $ hg debugindex f | "$PYTHON" ../no-linkrev
2530 rev linkrev nodeid p1 p2 2529 rev linkrev nodeid p1 p2
2531 0 * ae258f702dfe 000000000000 000000000000 2530 0 * ae258f702dfe 000000000000 000000000000
2532 1 * d3613c1ec831 ae258f702dfe 000000000000 2531 1 * d3613c1ec831 ae258f702dfe 000000000000
2533 2 * 05e03c868bbc ae258f702dfe 000000000000 2532 2 * 05e03c868bbc ae258f702dfe 000000000000
2534 #endif 2533 #endif
3096 0db3aad7fcc1ec27fab57060e327b9e864ea0cc9 644 v 3095 0db3aad7fcc1ec27fab57060e327b9e864ea0cc9 644 v
3097 $ hg manifest --debug --rev 'desc("p-2")' | grep '644 v' 3096 $ hg manifest --debug --rev 'desc("p-2")' | grep '644 v'
3098 3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644 v 3097 3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644 v
3099 $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' 3098 $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v'
3100 c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644 v 3099 c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644 v
3101 $ hg debugindex v | ../no-linkrev 3100 $ hg debugindex v | "$PYTHON" ../no-linkrev
3102 rev linkrev nodeid p1 p2 3101 rev linkrev nodeid p1 p2
3103 0 * 3f91841cd75c 000000000000 000000000000 3102 0 * 3f91841cd75c 000000000000 000000000000
3104 1 * c43c088b811f 000000000000 000000000000 3103 1 * c43c088b811f 000000000000 000000000000
3105 2 * 0946c662ef16 3f91841cd75c c43c088b811f 3104 2 * 0946c662ef16 3f91841cd75c c43c088b811f
3106 3 * 0db3aad7fcc1 c43c088b811f 3f91841cd75c 3105 3 * 0db3aad7fcc1 c43c088b811f 3f91841cd75c
3111 a098dda6413aecf154eefc976afc38b295acb7e5 644 v 3110 a098dda6413aecf154eefc976afc38b295acb7e5 644 v
3112 $ hg manifest --debug --rev 'desc("p-2")' | grep '644 v' 3111 $ hg manifest --debug --rev 'desc("p-2")' | grep '644 v'
3113 5aed6a8dbff0301328c08360d24354d3d064cf0d 644 v 3112 5aed6a8dbff0301328c08360d24354d3d064cf0d 644 v
3114 $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' 3113 $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v'
3115 a38b2fa170219750dac9bc7d19df831f213ba708 644 v 3114 a38b2fa170219750dac9bc7d19df831f213ba708 644 v
3116 $ hg debugindex v | ../no-linkrev 3115 $ hg debugindex v | "$PYTHON" ../no-linkrev
3117 rev linkrev nodeid p1 p2 3116 rev linkrev nodeid p1 p2
3118 0 * 5aed6a8dbff0 000000000000 000000000000 3117 0 * 5aed6a8dbff0 000000000000 000000000000
3119 1 * a38b2fa17021 000000000000 000000000000 3118 1 * a38b2fa17021 000000000000 000000000000
3120 2 * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021 3119 2 * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021
3121 3 * a098dda6413a a38b2fa17021 5aed6a8dbff0 3120 3 * a098dda6413a a38b2fa17021 5aed6a8dbff0
3394 774e7c1637d536b99e2d8ef16fd731f87a82bd09 644 f 3393 774e7c1637d536b99e2d8ef16fd731f87a82bd09 644 f
3395 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' 3394 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
3396 b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f 3395 b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f
3397 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' 3396 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
3398 e8825b386367b29fec957283a80bb47b47483fe1 644 f 3397 e8825b386367b29fec957283a80bb47b47483fe1 644 f
3399 $ hg debugindex f | ../no-linkrev 3398 $ hg debugindex f | "$PYTHON" ../no-linkrev
3400 rev linkrev nodeid p1 p2 3399 rev linkrev nodeid p1 p2
3401 0 * b76eb76580df 000000000000 000000000000 3400 0 * b76eb76580df 000000000000 000000000000
3402 1 * e8825b386367 000000000000 000000000000 3401 1 * e8825b386367 000000000000 000000000000
3403 2 * 2ff93c643948 b76eb76580df e8825b386367 3402 2 * 2ff93c643948 b76eb76580df e8825b386367
3404 3 * 2f649fba7eb2 b76eb76580df e8825b386367 3403 3 * 2f649fba7eb2 b76eb76580df e8825b386367
3410 05e03c868bbcab4a649cb33a238d7aa07398a469 644 f 3409 05e03c868bbcab4a649cb33a238d7aa07398a469 644 f
3411 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' 3410 $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
3412 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f 3411 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
3413 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' 3412 $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
3414 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f 3413 ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
3415 $ hg debugindex f | ../no-linkrev 3414 $ hg debugindex f | "$PYTHON" ../no-linkrev
3416 rev linkrev nodeid p1 p2 3415 rev linkrev nodeid p1 p2
3417 0 * ae258f702dfe 000000000000 000000000000 3416 0 * ae258f702dfe 000000000000 000000000000
3418 1 * d3613c1ec831 ae258f702dfe 000000000000 3417 1 * d3613c1ec831 ae258f702dfe 000000000000
3419 2 * 05e03c868bbc ae258f702dfe 000000000000 3418 2 * 05e03c868bbc ae258f702dfe 000000000000
3420 #endif 3419 #endif