tests/test-copies-chain-merge.t
branchstable
changeset 49366 288de6f5d724
parent 49252 4141951dacff
child 50725 7e5be4a7cda7
equal deleted inserted replaced
49364:e8ea403b1c46 49366:288de6f5d724
   509   $ hg commit -m "f-1: rename h -> i"
   509   $ hg commit -m "f-1: rename h -> i"
   510   created new head
   510   created new head
   511   $ hg mv --force i d
   511   $ hg mv --force i d
   512   $ hg commit -m "f-2: rename i -> d"
   512   $ hg commit -m "f-2: rename i -> d"
   513   $ hg debugindex d | "$PYTHON" ../no-linkrev
   513   $ hg debugindex d | "$PYTHON" ../no-linkrev
   514      rev linkrev nodeid       p1           p2
   514      rev linkrev       nodeid    p1-nodeid    p2-nodeid
   515        0       * d8252ab2e760 000000000000 000000000000 (no-changeset !)
   515        0       * d8252ab2e760 000000000000 000000000000 (no-changeset !)
   516        0       * ae258f702dfe 000000000000 000000000000 (changeset !)
   516        0       * ae258f702dfe 000000000000 000000000000 (changeset !)
   517        1       * b004912a8510 000000000000 000000000000
   517        1       * b004912a8510 000000000000 000000000000
   518        2       * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
   518        2       * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
   519   $ hg up 'desc("b-1")'
   519   $ hg up 'desc("b-1")'
   565   $ hg commit -m "r-1: rename r -> x"
   565   $ hg commit -m "r-1: rename r -> x"
   566   created new head
   566   created new head
   567   $ hg mv --force x t
   567   $ hg mv --force x t
   568   $ hg commit -m "r-2: rename t -> x"
   568   $ hg commit -m "r-2: rename t -> x"
   569   $ hg debugindex t | "$PYTHON" ../no-linkrev
   569   $ hg debugindex t | "$PYTHON" ../no-linkrev
   570      rev linkrev nodeid       p1           p2
   570      rev linkrev       nodeid    p1-nodeid    p2-nodeid
   571        0       * d74efbf65309 000000000000 000000000000 (no-changeset !)
   571        0       * d74efbf65309 000000000000 000000000000 (no-changeset !)
   572        1       * 02a930b9d7ad 000000000000 000000000000 (no-changeset !)
   572        1       * 02a930b9d7ad 000000000000 000000000000 (no-changeset !)
   573        0       * 5aed6a8dbff0 000000000000 000000000000 (changeset !)
   573        0       * 5aed6a8dbff0 000000000000 000000000000 (changeset !)
   574        1       * a38b2fa17021 000000000000 000000000000 (changeset !)
   574        1       * a38b2fa17021 000000000000 000000000000 (changeset !)
   575   $ hg up 'desc("b-1")'
   575   $ hg up 'desc("b-1")'
   932 
   932 
   933   $ hg up 'desc("f-2")'
   933   $ hg up 'desc("f-2")'
   934   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
   934   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
   935 #if no-changeset
   935 #if no-changeset
   936   $ hg debugindex d | "$PYTHON" ../no-linkrev
   936   $ hg debugindex d | "$PYTHON" ../no-linkrev
   937      rev linkrev nodeid       p1           p2
   937      rev linkrev       nodeid    p1-nodeid    p2-nodeid
   938        0       * d8252ab2e760 000000000000 000000000000
   938        0       * d8252ab2e760 000000000000 000000000000
   939        1       * b004912a8510 000000000000 000000000000
   939        1       * b004912a8510 000000000000 000000000000
   940        2       * 7b79e2fe0c89 000000000000 000000000000
   940        2       * 7b79e2fe0c89 000000000000 000000000000
   941        3       * 17ec97e60577 d8252ab2e760 000000000000
   941        3       * 17ec97e60577 d8252ab2e760 000000000000
   942        4       * 06dabf50734c b004912a8510 17ec97e60577
   942        4       * 06dabf50734c b004912a8510 17ec97e60577
   943        5       * 19c0e3924691 17ec97e60577 b004912a8510
   943        5       * 19c0e3924691 17ec97e60577 b004912a8510
   944        6       * 89c873a01d97 7b79e2fe0c89 17ec97e60577
   944        6       * 89c873a01d97 7b79e2fe0c89 17ec97e60577
   945        7       * d55cb4e9ef57 000000000000 000000000000
   945        7       * d55cb4e9ef57 000000000000 000000000000
   946 #else
   946 #else
   947   $ hg debugindex d | "$PYTHON" ../no-linkrev
   947   $ hg debugindex d | "$PYTHON" ../no-linkrev
   948      rev linkrev nodeid       p1           p2
   948      rev linkrev       nodeid    p1-nodeid    p2-nodeid
   949        0       * ae258f702dfe 000000000000 000000000000
   949        0       * ae258f702dfe 000000000000 000000000000
   950        1       * b004912a8510 000000000000 000000000000
   950        1       * b004912a8510 000000000000 000000000000
   951        2       * 5cce88bf349f ae258f702dfe 000000000000
   951        2       * 5cce88bf349f ae258f702dfe 000000000000
   952        3       * cc269dd788c8 b004912a8510 5cce88bf349f
   952        3       * cc269dd788c8 b004912a8510 5cce88bf349f
   953        4       * 51c91a115080 5cce88bf349f b004912a8510
   953        4       * 51c91a115080 5cce88bf349f b004912a8510
   977   $ hg manifest --rev . --debug | grep "  d"
   977   $ hg manifest --rev . --debug | grep "  d"
   978   1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644   d (no-changeset !)
   978   1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644   d (no-changeset !)
   979   cea2d99c0fde64672ef61953786fdff34f16e230 644   d (changeset !)
   979   cea2d99c0fde64672ef61953786fdff34f16e230 644   d (changeset !)
   980 #if no-changeset
   980 #if no-changeset
   981   $ hg debugindex d | "$PYTHON" ../no-linkrev
   981   $ hg debugindex d | "$PYTHON" ../no-linkrev
   982      rev linkrev nodeid       p1           p2
   982      rev linkrev       nodeid    p1-nodeid    p2-nodeid
   983        0       * d8252ab2e760 000000000000 000000000000
   983        0       * d8252ab2e760 000000000000 000000000000
   984        1       * b004912a8510 000000000000 000000000000
   984        1       * b004912a8510 000000000000 000000000000
   985        2       * 7b79e2fe0c89 000000000000 000000000000
   985        2       * 7b79e2fe0c89 000000000000 000000000000
   986        3       * 17ec97e60577 d8252ab2e760 000000000000
   986        3       * 17ec97e60577 d8252ab2e760 000000000000
   987        4       * 06dabf50734c b004912a8510 17ec97e60577
   987        4       * 06dabf50734c b004912a8510 17ec97e60577
   989        6       * 89c873a01d97 7b79e2fe0c89 17ec97e60577
   989        6       * 89c873a01d97 7b79e2fe0c89 17ec97e60577
   990        7       * d55cb4e9ef57 000000000000 000000000000
   990        7       * d55cb4e9ef57 000000000000 000000000000
   991        8       * 1c334238bd42 7b79e2fe0c89 000000000000
   991        8       * 1c334238bd42 7b79e2fe0c89 000000000000
   992 #else
   992 #else
   993   $ hg debugindex d | "$PYTHON" ../no-linkrev
   993   $ hg debugindex d | "$PYTHON" ../no-linkrev
   994      rev linkrev nodeid       p1           p2
   994      rev linkrev       nodeid    p1-nodeid    p2-nodeid
   995        0       * ae258f702dfe 000000000000 000000000000
   995        0       * ae258f702dfe 000000000000 000000000000
   996        1       * b004912a8510 000000000000 000000000000
   996        1       * b004912a8510 000000000000 000000000000
   997        2       * 5cce88bf349f ae258f702dfe 000000000000
   997        2       * 5cce88bf349f ae258f702dfe 000000000000
   998        3       * cc269dd788c8 b004912a8510 5cce88bf349f
   998        3       * cc269dd788c8 b004912a8510 5cce88bf349f
   999        4       * 51c91a115080 5cce88bf349f b004912a8510
   999        4       * 51c91a115080 5cce88bf349f b004912a8510
  1659   requirements
  1659   requirements
  1660      preserved: * (glob)
  1660      preserved: * (glob)
  1661      added: exp-changelog-v2, exp-copies-sidedata-changeset
  1661      added: exp-changelog-v2, exp-copies-sidedata-changeset
  1662   
  1662   
  1663   processed revlogs:
  1663   processed revlogs:
  1664     - all-filelogs
       
  1665     - changelog
  1664     - changelog
  1666     - manifest
       
  1667   
  1665   
  1668 #endif
  1666 #endif
  1669 
  1667 
  1670 #if upgraded-parallel
  1668 #if upgraded-parallel
  1671   $ cat >> $HGRCPATH << EOF
  1669   $ cat >> $HGRCPATH << EOF
  1687   requirements
  1685   requirements
  1688      preserved: * (glob)
  1686      preserved: * (glob)
  1689      added: exp-changelog-v2, exp-copies-sidedata-changeset
  1687      added: exp-changelog-v2, exp-copies-sidedata-changeset
  1690   
  1688   
  1691   processed revlogs:
  1689   processed revlogs:
  1692     - all-filelogs
       
  1693     - changelog
  1690     - changelog
  1694     - manifest
       
  1695   
  1691   
  1696 #endif
  1692 #endif
  1697 
  1693 
  1698 #if pull
  1694 #if pull
  1699   $ cd ..
  1695   $ cd ..
  2404   b004912a8510032a0350a74daa2803dadfb00e12 644   d
  2400   b004912a8510032a0350a74daa2803dadfb00e12 644   d
  2405   $ hg manifest --debug --rev 'desc("b-1")' | grep '644   d'
  2401   $ hg manifest --debug --rev 'desc("b-1")' | grep '644   d'
  2406   d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644   d (no-changeset !)
  2402   d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644   d (no-changeset !)
  2407   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   d (changeset !)
  2403   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   d (changeset !)
  2408   $ hg debugindex d | head -n 4 | "$PYTHON" ../no-linkrev
  2404   $ hg debugindex d | head -n 4 | "$PYTHON" ../no-linkrev
  2409      rev linkrev nodeid       p1           p2
  2405      rev linkrev       nodeid    p1-nodeid    p2-nodeid
  2410        0       * d8252ab2e760 000000000000 000000000000 (no-changeset !)
  2406        0       * d8252ab2e760 000000000000 000000000000 (no-changeset !)
  2411        0       * ae258f702dfe 000000000000 000000000000 (changeset !)
  2407        0       * ae258f702dfe 000000000000 000000000000 (changeset !)
  2412        1       * b004912a8510 000000000000 000000000000
  2408        1       * b004912a8510 000000000000 000000000000
  2413        2       * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
  2409        2       * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
  2414        2       * 5cce88bf349f ae258f702dfe 000000000000 (changeset !)
  2410        2       * 5cce88bf349f ae258f702dfe 000000000000 (changeset !)
  2477   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
  2473   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
  2478   b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644   f
  2474   b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644   f
  2479   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
  2475   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
  2480   e8825b386367b29fec957283a80bb47b47483fe1 644   f
  2476   e8825b386367b29fec957283a80bb47b47483fe1 644   f
  2481   $ hg debugindex f | "$PYTHON" ../no-linkrev
  2477   $ hg debugindex f | "$PYTHON" ../no-linkrev
  2482      rev linkrev nodeid       p1           p2
  2478      rev linkrev       nodeid    p1-nodeid    p2-nodeid
  2483        0       * b76eb76580df 000000000000 000000000000
  2479        0       * b76eb76580df 000000000000 000000000000
  2484        1       * e8825b386367 000000000000 000000000000
  2480        1       * e8825b386367 000000000000 000000000000
  2485        2       * 2ff93c643948 b76eb76580df e8825b386367
  2481        2       * 2ff93c643948 b76eb76580df e8825b386367
  2486        3       * 2f649fba7eb2 b76eb76580df e8825b386367
  2482        3       * 2f649fba7eb2 b76eb76580df e8825b386367
  2487        4       * 774e7c1637d5 e8825b386367 b76eb76580df
  2483        4       * 774e7c1637d5 e8825b386367 b76eb76580df
  2493   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
  2489   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
  2494   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
  2490   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
  2495   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
  2491   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
  2496   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
  2492   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
  2497   $ hg debugindex f | "$PYTHON" ../no-linkrev
  2493   $ hg debugindex f | "$PYTHON" ../no-linkrev
  2498      rev linkrev nodeid       p1           p2
  2494      rev linkrev       nodeid    p1-nodeid    p2-nodeid
  2499        0       * ae258f702dfe 000000000000 000000000000
  2495        0       * ae258f702dfe 000000000000 000000000000
  2500        1       * d3613c1ec831 ae258f702dfe 000000000000
  2496        1       * d3613c1ec831 ae258f702dfe 000000000000
  2501        2       * 05e03c868bbc ae258f702dfe 000000000000
  2497        2       * 05e03c868bbc ae258f702dfe 000000000000
  2502 #endif
  2498 #endif
  2503 
  2499 
  3065   $ hg manifest --debug --rev 'desc("p-2")' | grep '644   v'
  3061   $ hg manifest --debug --rev 'desc("p-2")' | grep '644   v'
  3066   3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644   v
  3062   3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644   v
  3067   $ hg manifest --debug --rev 'desc("q-2")' | grep '644   v'
  3063   $ hg manifest --debug --rev 'desc("q-2")' | grep '644   v'
  3068   c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644   v
  3064   c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644   v
  3069   $ hg debugindex v | "$PYTHON" ../no-linkrev
  3065   $ hg debugindex v | "$PYTHON" ../no-linkrev
  3070      rev linkrev nodeid       p1           p2
  3066      rev linkrev       nodeid    p1-nodeid    p2-nodeid
  3071        0       * 3f91841cd75c 000000000000 000000000000
  3067        0       * 3f91841cd75c 000000000000 000000000000
  3072        1       * c43c088b811f 000000000000 000000000000
  3068        1       * c43c088b811f 000000000000 000000000000
  3073        2       * 0946c662ef16 3f91841cd75c c43c088b811f
  3069        2       * 0946c662ef16 3f91841cd75c c43c088b811f
  3074        3       * 0db3aad7fcc1 c43c088b811f 3f91841cd75c
  3070        3       * 0db3aad7fcc1 c43c088b811f 3f91841cd75c
  3075 #else
  3071 #else
  3080   $ hg manifest --debug --rev 'desc("p-2")' | grep '644   v'
  3076   $ hg manifest --debug --rev 'desc("p-2")' | grep '644   v'
  3081   5aed6a8dbff0301328c08360d24354d3d064cf0d 644   v
  3077   5aed6a8dbff0301328c08360d24354d3d064cf0d 644   v
  3082   $ hg manifest --debug --rev 'desc("q-2")' | grep '644   v'
  3078   $ hg manifest --debug --rev 'desc("q-2")' | grep '644   v'
  3083   a38b2fa170219750dac9bc7d19df831f213ba708 644   v
  3079   a38b2fa170219750dac9bc7d19df831f213ba708 644   v
  3084   $ hg debugindex v | "$PYTHON" ../no-linkrev
  3080   $ hg debugindex v | "$PYTHON" ../no-linkrev
  3085      rev linkrev nodeid       p1           p2
  3081      rev linkrev       nodeid    p1-nodeid    p2-nodeid
  3086        0       * 5aed6a8dbff0 000000000000 000000000000
  3082        0       * 5aed6a8dbff0 000000000000 000000000000
  3087        1       * a38b2fa17021 000000000000 000000000000
  3083        1       * a38b2fa17021 000000000000 000000000000
  3088        2       * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021
  3084        2       * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021
  3089        3       * a098dda6413a a38b2fa17021 5aed6a8dbff0
  3085        3       * a098dda6413a a38b2fa17021 5aed6a8dbff0
  3090 #endif
  3086 #endif
  3363   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
  3359   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
  3364   b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644   f
  3360   b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644   f
  3365   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
  3361   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
  3366   e8825b386367b29fec957283a80bb47b47483fe1 644   f
  3362   e8825b386367b29fec957283a80bb47b47483fe1 644   f
  3367   $ hg debugindex f | "$PYTHON" ../no-linkrev
  3363   $ hg debugindex f | "$PYTHON" ../no-linkrev
  3368      rev linkrev nodeid       p1           p2
  3364      rev linkrev       nodeid    p1-nodeid    p2-nodeid
  3369        0       * b76eb76580df 000000000000 000000000000
  3365        0       * b76eb76580df 000000000000 000000000000
  3370        1       * e8825b386367 000000000000 000000000000
  3366        1       * e8825b386367 000000000000 000000000000
  3371        2       * 2ff93c643948 b76eb76580df e8825b386367
  3367        2       * 2ff93c643948 b76eb76580df e8825b386367
  3372        3       * 2f649fba7eb2 b76eb76580df e8825b386367
  3368        3       * 2f649fba7eb2 b76eb76580df e8825b386367
  3373        4       * 774e7c1637d5 e8825b386367 b76eb76580df
  3369        4       * 774e7c1637d5 e8825b386367 b76eb76580df
  3379   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
  3375   $ hg manifest --debug --rev 'desc("a-2")' | grep '644   f'
  3380   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
  3376   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
  3381   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
  3377   $ hg manifest --debug --rev 'desc("e-2")' | grep '644   f'
  3382   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
  3378   ae258f702dfeca05bf9b6a22a97a4b5645570f11 644   f
  3383   $ hg debugindex f | "$PYTHON" ../no-linkrev
  3379   $ hg debugindex f | "$PYTHON" ../no-linkrev
  3384      rev linkrev nodeid       p1           p2
  3380      rev linkrev       nodeid    p1-nodeid    p2-nodeid
  3385        0       * ae258f702dfe 000000000000 000000000000
  3381        0       * ae258f702dfe 000000000000 000000000000
  3386        1       * d3613c1ec831 ae258f702dfe 000000000000
  3382        1       * d3613c1ec831 ae258f702dfe 000000000000
  3387        2       * 05e03c868bbc ae258f702dfe 000000000000
  3383        2       * 05e03c868bbc ae258f702dfe 000000000000
  3388 #endif
  3384 #endif
  3389 
  3385