Show More
@@ -25,7 +25,6 b' use git diff to see rename' | |||||
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] | |
@@ -481,7 +480,7 b' Merge:' | |||||
481 | created new head |
|
480 | created new head | |
482 | $ hg mv --force i d |
|
481 | $ hg mv --force i d | |
483 | $ hg commit -m "f-2: rename i -> d" |
|
482 | $ hg commit -m "f-2: rename i -> d" | |
484 | $ hg debugindex d | ../no-linkrev |
|
483 | $ hg debugindex d | "$PYTHON" ../no-linkrev | |
485 | rev linkrev nodeid p1 p2 |
|
484 | rev linkrev nodeid p1 p2 | |
486 | 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) |
|
485 | 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) | |
487 | 0 * ae258f702dfe 000000000000 000000000000 (changeset !) |
|
486 | 0 * ae258f702dfe 000000000000 000000000000 (changeset !) | |
@@ -537,7 +536,7 b' Merge:' | |||||
537 | created new head |
|
536 | created new head | |
538 | $ hg mv --force x t |
|
537 | $ hg mv --force x t | |
539 | $ hg commit -m "r-2: rename t -> x" |
|
538 | $ hg commit -m "r-2: rename t -> x" | |
540 | $ hg debugindex t | ../no-linkrev |
|
539 | $ hg debugindex t | "$PYTHON" ../no-linkrev | |
541 | rev linkrev nodeid p1 p2 |
|
540 | rev linkrev nodeid p1 p2 | |
542 | 0 * d74efbf65309 000000000000 000000000000 (no-changeset !) |
|
541 | 0 * d74efbf65309 000000000000 000000000000 (no-changeset !) | |
543 | 1 * 02a930b9d7ad 000000000000 000000000000 (no-changeset !) |
|
542 | 1 * 02a930b9d7ad 000000000000 000000000000 (no-changeset !) | |
@@ -904,7 +903,7 b' Merge:' | |||||
904 | $ hg up 'desc("f-2")' |
|
903 | $ hg up 'desc("f-2")' | |
905 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
904 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
906 | #if no-changeset |
|
905 | #if no-changeset | |
907 | $ hg debugindex d | ../no-linkrev |
|
906 | $ hg debugindex d | "$PYTHON" ../no-linkrev | |
908 | rev linkrev nodeid p1 p2 |
|
907 | rev linkrev nodeid p1 p2 | |
909 | 0 * d8252ab2e760 000000000000 000000000000 |
|
908 | 0 * d8252ab2e760 000000000000 000000000000 | |
910 | 1 * b004912a8510 000000000000 000000000000 |
|
909 | 1 * b004912a8510 000000000000 000000000000 | |
@@ -915,7 +914,7 b' Merge:' | |||||
915 | 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 |
|
914 | 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 | |
916 | 7 * d55cb4e9ef57 000000000000 000000000000 |
|
915 | 7 * d55cb4e9ef57 000000000000 000000000000 | |
917 | #else |
|
916 | #else | |
918 | $ hg debugindex d | ../no-linkrev |
|
917 | $ hg debugindex d | "$PYTHON" ../no-linkrev | |
919 | rev linkrev nodeid p1 p2 |
|
918 | rev linkrev nodeid p1 p2 | |
920 | 0 * ae258f702dfe 000000000000 000000000000 |
|
919 | 0 * ae258f702dfe 000000000000 000000000000 | |
921 | 1 * b004912a8510 000000000000 000000000000 |
|
920 | 1 * b004912a8510 000000000000 000000000000 | |
@@ -949,7 +948,7 b' Merge:' | |||||
949 | 1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !) |
|
948 | 1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !) | |
950 | cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !) |
|
949 | cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !) | |
951 | #if no-changeset |
|
950 | #if no-changeset | |
952 | $ hg debugindex d | ../no-linkrev |
|
951 | $ hg debugindex d | "$PYTHON" ../no-linkrev | |
953 | rev linkrev nodeid p1 p2 |
|
952 | rev linkrev nodeid p1 p2 | |
954 | 0 * d8252ab2e760 000000000000 000000000000 |
|
953 | 0 * d8252ab2e760 000000000000 000000000000 | |
955 | 1 * b004912a8510 000000000000 000000000000 |
|
954 | 1 * b004912a8510 000000000000 000000000000 | |
@@ -961,7 +960,7 b' Merge:' | |||||
961 | 7 * d55cb4e9ef57 000000000000 000000000000 |
|
960 | 7 * d55cb4e9ef57 000000000000 000000000000 | |
962 | 8 * 1c334238bd42 7b79e2fe0c89 000000000000 |
|
961 | 8 * 1c334238bd42 7b79e2fe0c89 000000000000 | |
963 | #else |
|
962 | #else | |
964 | $ hg debugindex d | ../no-linkrev |
|
963 | $ hg debugindex d | "$PYTHON" ../no-linkrev | |
965 | rev linkrev nodeid p1 p2 |
|
964 | rev linkrev nodeid p1 p2 | |
966 | 0 * ae258f702dfe 000000000000 000000000000 |
|
965 | 0 * ae258f702dfe 000000000000 000000000000 | |
967 | 1 * b004912a8510 000000000000 000000000000 |
|
966 | 1 * b004912a8510 000000000000 000000000000 | |
@@ -2327,7 +2326,7 b' The bugs makes recorded copy is differen' | |||||
2327 | $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' |
|
2326 | $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' | |
2328 | d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !) |
|
2327 | d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !) | |
2329 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !) |
|
2328 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !) | |
2330 | $ hg debugindex d | head -n 4 | ../no-linkrev |
|
2329 | $ hg debugindex d | head -n 4 | "$PYTHON" ../no-linkrev | |
2331 | rev linkrev nodeid p1 p2 |
|
2330 | rev linkrev nodeid p1 p2 | |
2332 | 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) |
|
2331 | 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) | |
2333 | 0 * ae258f702dfe 000000000000 000000000000 (changeset !) |
|
2332 | 0 * ae258f702dfe 000000000000 000000000000 (changeset !) | |
@@ -2400,7 +2399,7 b' Subcase: new copy information on both si' | |||||
2400 | b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f |
|
2399 | b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f | |
2401 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
|
2400 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' | |
2402 | e8825b386367b29fec957283a80bb47b47483fe1 644 f |
|
2401 | e8825b386367b29fec957283a80bb47b47483fe1 644 f | |
2403 | $ hg debugindex f | ../no-linkrev |
|
2402 | $ hg debugindex f | "$PYTHON" ../no-linkrev | |
2404 | rev linkrev nodeid p1 p2 |
|
2403 | rev linkrev nodeid p1 p2 | |
2405 | 0 * b76eb76580df 000000000000 000000000000 |
|
2404 | 0 * b76eb76580df 000000000000 000000000000 | |
2406 | 1 * e8825b386367 000000000000 000000000000 |
|
2405 | 1 * e8825b386367 000000000000 000000000000 | |
@@ -2416,7 +2415,7 b' Subcase: new copy information on both si' | |||||
2416 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
|
2415 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f | |
2417 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
|
2416 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' | |
2418 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
|
2417 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f | |
2419 | $ hg debugindex f | ../no-linkrev |
|
2418 | $ hg debugindex f | "$PYTHON" ../no-linkrev | |
2420 | rev linkrev nodeid p1 p2 |
|
2419 | rev linkrev nodeid p1 p2 | |
2421 | 0 * ae258f702dfe 000000000000 000000000000 |
|
2420 | 0 * ae258f702dfe 000000000000 000000000000 | |
2422 | 1 * d3613c1ec831 ae258f702dfe 000000000000 |
|
2421 | 1 * d3613c1ec831 ae258f702dfe 000000000000 | |
@@ -2988,7 +2987,7 b' Subcase: new copy information on both si' | |||||
2988 | 3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644 v |
|
2987 | 3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644 v | |
2989 | $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' |
|
2988 | $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' | |
2990 | c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644 v |
|
2989 | c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644 v | |
2991 | $ hg debugindex v | ../no-linkrev |
|
2990 | $ hg debugindex v | "$PYTHON" ../no-linkrev | |
2992 | rev linkrev nodeid p1 p2 |
|
2991 | rev linkrev nodeid p1 p2 | |
2993 | 0 * 3f91841cd75c 000000000000 000000000000 |
|
2992 | 0 * 3f91841cd75c 000000000000 000000000000 | |
2994 | 1 * c43c088b811f 000000000000 000000000000 |
|
2993 | 1 * c43c088b811f 000000000000 000000000000 | |
@@ -3003,7 +3002,7 b' Subcase: new copy information on both si' | |||||
3003 | 5aed6a8dbff0301328c08360d24354d3d064cf0d 644 v |
|
3002 | 5aed6a8dbff0301328c08360d24354d3d064cf0d 644 v | |
3004 | $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' |
|
3003 | $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' | |
3005 | a38b2fa170219750dac9bc7d19df831f213ba708 644 v |
|
3004 | a38b2fa170219750dac9bc7d19df831f213ba708 644 v | |
3006 | $ hg debugindex v | ../no-linkrev |
|
3005 | $ hg debugindex v | "$PYTHON" ../no-linkrev | |
3007 | rev linkrev nodeid p1 p2 |
|
3006 | rev linkrev nodeid p1 p2 | |
3008 | 0 * 5aed6a8dbff0 000000000000 000000000000 |
|
3007 | 0 * 5aed6a8dbff0 000000000000 000000000000 | |
3009 | 1 * a38b2fa17021 000000000000 000000000000 |
|
3008 | 1 * a38b2fa17021 000000000000 000000000000 | |
@@ -3286,7 +3285,7 b' Subcase: merge has same initial content ' | |||||
3286 | b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f |
|
3285 | b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f | |
3287 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
|
3286 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' | |
3288 | e8825b386367b29fec957283a80bb47b47483fe1 644 f |
|
3287 | e8825b386367b29fec957283a80bb47b47483fe1 644 f | |
3289 | $ hg debugindex f | ../no-linkrev |
|
3288 | $ hg debugindex f | "$PYTHON" ../no-linkrev | |
3290 | rev linkrev nodeid p1 p2 |
|
3289 | rev linkrev nodeid p1 p2 | |
3291 | 0 * b76eb76580df 000000000000 000000000000 |
|
3290 | 0 * b76eb76580df 000000000000 000000000000 | |
3292 | 1 * e8825b386367 000000000000 000000000000 |
|
3291 | 1 * e8825b386367 000000000000 000000000000 | |
@@ -3302,7 +3301,7 b' Subcase: merge has same initial content ' | |||||
3302 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
|
3301 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f | |
3303 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' |
|
3302 | $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' | |
3304 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f |
|
3303 | ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f | |
3305 | $ hg debugindex f | ../no-linkrev |
|
3304 | $ hg debugindex f | "$PYTHON" ../no-linkrev | |
3306 | rev linkrev nodeid p1 p2 |
|
3305 | rev linkrev nodeid p1 p2 | |
3307 | 0 * ae258f702dfe 000000000000 000000000000 |
|
3306 | 0 * ae258f702dfe 000000000000 000000000000 | |
3308 | 1 * d3613c1ec831 ae258f702dfe 000000000000 |
|
3307 | 1 * d3613c1ec831 ae258f702dfe 000000000000 |
General Comments 0
You need to be logged in to leave comments.
Login now