218 bundle2-input-bundle: 8 parts total |
218 bundle2-input-bundle: 8 parts total |
219 checking for updated bookmarks |
219 checking for updated bookmarks |
220 updating the branch cache |
220 updating the branch cache |
221 new changesets 1ea73414a91b:f864bc82f6a2 |
221 new changesets 1ea73414a91b:f864bc82f6a2 |
222 (run 'hg update' to get a working copy) |
222 (run 'hg update' to get a working copy) |
|
223 |
|
224 $ touch oldbundles |
|
225 $ ls -1 server/.hg/cache/pullbundles > newbundles |
|
226 $ diff -u oldbundles newbundles |
|
227 --- oldbundles * (glob) |
|
228 +++ newbundles * (glob) |
|
229 @@ -0,0 +1,6 @@ |
|
230 +02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg |
|
231 +02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg |
|
232 +02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg |
|
233 +02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg |
|
234 +02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg |
|
235 +02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg |
|
236 [1] |
223 |
237 |
224 pull the other missing entries (multiple heads pulled) |
238 pull the other missing entries (multiple heads pulled) |
225 ------------------------------------------------------ |
239 ------------------------------------------------------ |
226 |
240 |
227 $ hg -R server log -G -T '{rev}:{node}\n' -r '1234+head()+(only(head(), 1234) and (merge() or branchpoint()))' |
241 $ hg -R server log -G -T '{rev}:{node}\n' -r '1234+head()+(only(head(), 1234) and (merge() or branchpoint()))' |
624 checking for updated bookmarks |
638 checking for updated bookmarks |
625 updating the branch cache |
639 updating the branch cache |
626 new changesets 17185c1c22f1:1dded5aafa0f |
640 new changesets 17185c1c22f1:1dded5aafa0f |
627 (run 'hg heads' to see heads, 'hg merge' to merge) |
641 (run 'hg heads' to see heads, 'hg merge' to merge) |
628 |
642 |
|
643 $ mv newbundles oldbundles |
|
644 $ ls -1 server/.hg/cache/pullbundles > newbundles |
|
645 $ diff -u oldbundles newbundles |
|
646 --- oldbundles * (glob) |
|
647 +++ newbundles * (glob) |
|
648 @@ -1,6 +1,22 @@ |
|
649 +02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg |
|
650 +02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg |
|
651 +02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg |
|
652 +02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg |
|
653 02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg |
|
654 +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg |
|
655 02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg |
|
656 +02-5eaa75df73c454c1afff722301a4c73e897de94d-0000001256skip-0000000008size.hg |
|
657 02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg |
|
658 02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg |
|
659 +02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg |
|
660 +02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg |
|
661 +02-ca970a853ea24846035ccb324cc8de49ef768748-0000001252skip-0000000004size.hg |
|
662 +02-d1807e3513890ac71c2e8d10e9dc9a5b58b15d4b-0000001251skip-0000000001size.hg |
|
663 +02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001235skip-0000000016size.hg |
|
664 +02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg |
|
665 +02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg |
|
666 +02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg |
|
667 +02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg |
|
668 02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg |
|
669 02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg |
|
670 +02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg |
|
671 [1] |
|
672 |
629 Same Pullin with a different client |
673 Same Pullin with a different client |
630 ----------------------------------- |
674 ----------------------------------- |
631 $ hg -R server log -G -T '{rev}:{node}\n' -r '0+1234+(::1234 and (merge() or branchpoint()))' |
675 $ hg -R server log -G -T '{rev}:{node}\n' -r '0+1234+(::1234 and (merge() or branchpoint()))' |
632 o 1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd |
676 o 1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd |
633 : |
677 : |
637 |
681 |
638 |
682 |
639 $ hg -R client2 pull server -r 1234 --debug --config devel.bundle2.debug=yes --traceback| grep -v 'add changeset' |
683 $ hg -R client2 pull server -r 1234 --debug --config devel.bundle2.debug=yes --traceback| grep -v 'add changeset' |
640 pulling from server |
684 pulling from server |
641 query 1; heads |
685 query 1; heads |
642 1024 changesets found |
686 1024 changesets found in caches |
643 128 changesets found |
687 128 changesets found in caches |
644 64 changesets found |
688 64 changesets found in caches |
645 16 changesets found |
689 16 changesets found in caches |
646 2 changesets found |
690 2 changesets found in caches |
647 1 changesets found |
691 1 changesets found in caches |
648 listing keys for "bookmarks" |
692 listing keys for "bookmarks" |
649 bundle2-output-bundle: "HG20", 9 parts total |
693 bundle2-output-bundle: "HG20", 9 parts total |
650 bundle2-output: start emission of HG20 stream |
694 bundle2-output: start emission of HG20 stream |
651 bundle2-output: bundle parameter: |
695 bundle2-output: bundle parameter: |
652 bundle2-output: start of parts |
696 bundle2-output: start of parts |
826 bundle2-input-bundle: 8 parts total |
870 bundle2-input-bundle: 8 parts total |
827 checking for updated bookmarks |
871 checking for updated bookmarks |
828 updating the branch cache |
872 updating the branch cache |
829 new changesets 1ea73414a91b:f864bc82f6a2 |
873 new changesets 1ea73414a91b:f864bc82f6a2 |
830 (run 'hg update' to get a working copy) |
874 (run 'hg update' to get a working copy) |
|
875 |
|
876 $ mv newbundles oldbundles |
|
877 $ ls -1 server/.hg/cache/pullbundles > newbundles |
|
878 $ diff -u oldbundles newbundles |
831 |
879 |
832 $ hg -R server log -G -T '{rev}:{node}\n' -r '1234+head()+(only(head(), 1234) and (merge() or branchpoint()))' |
880 $ hg -R server log -G -T '{rev}:{node}\n' -r '1234+head()+(only(head(), 1234) and (merge() or branchpoint()))' |
833 o 2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1 |
881 o 2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1 |
834 : |
882 : |
835 o 1663:1710092b3ab17a6d2ecad664580991a608537749 |
883 o 1663:1710092b3ab17a6d2ecad664580991a608537749 |
846 $ hg -R client2 pull server --debug --config devel.bundle2.debug=yes | grep -v 'add changeset' |
894 $ hg -R client2 pull server --debug --config devel.bundle2.debug=yes | grep -v 'add changeset' |
847 pulling from server |
895 pulling from server |
848 query 1; heads |
896 query 1; heads |
849 searching for changes |
897 searching for changes |
850 all local heads known remotely |
898 all local heads known remotely |
851 16 changesets found |
899 16 changesets found in caches |
852 29 changesets found |
900 29 changesets found in caches |
853 256 changesets found |
901 256 changesets found in caches |
854 256 changesets found |
902 256 changesets found in caches |
855 64 changesets found |
903 64 changesets found in caches |
856 8 changesets found |
904 8 changesets found in caches |
857 1 changesets found |
905 1 changesets found in caches |
858 4 changesets found |
906 4 changesets found in caches |
859 8 changesets found |
907 8 changesets found in caches |
860 16 changesets found |
908 16 changesets found in caches |
861 128 changesets found |
909 128 changesets found in caches |
862 64 changesets found |
910 64 changesets found in caches |
863 32 changesets found |
911 32 changesets found in caches |
864 8 changesets found |
912 8 changesets found in caches |
865 4 changesets found |
913 4 changesets found in caches |
866 2 changesets found |
914 2 changesets found in caches |
867 listing keys for "bookmarks" |
915 listing keys for "bookmarks" |
868 bundle2-output-bundle: "HG20", 19 parts total |
916 bundle2-output-bundle: "HG20", 19 parts total |
869 bundle2-output: start emission of HG20 stream |
917 bundle2-output: start emission of HG20 stream |
870 bundle2-output: bundle parameter: |
918 bundle2-output: bundle parameter: |
871 bundle2-output: start of parts |
919 bundle2-output: start of parts |
1229 bundle2-input-bundle: 18 parts total |
1277 bundle2-input-bundle: 18 parts total |
1230 checking for updated bookmarks |
1278 checking for updated bookmarks |
1231 updating the branch cache |
1279 updating the branch cache |
1232 new changesets 17185c1c22f1:1dded5aafa0f |
1280 new changesets 17185c1c22f1:1dded5aafa0f |
1233 (run 'hg heads' to see heads, 'hg merge' to merge) |
1281 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1282 |
|
1283 $ mv newbundles oldbundles |
|
1284 $ ls -1 server/.hg/cache/pullbundles > newbundles |
|
1285 $ diff -u oldbundles newbundles |
1234 |
1286 |
1235 different pull with a different client |
1287 different pull with a different client |
1236 -------------------------------------- |
1288 -------------------------------------- |
1237 |
1289 |
1238 $ hg -R server log -G -T '{rev}:{node}\n' -r '87232049c8d1+0+1789+(::1789 and (merge() or branchpoint()))' |
1290 $ hg -R server log -G -T '{rev}:{node}\n' -r '87232049c8d1+0+1789+(::1789 and (merge() or branchpoint()))' |
1502 checking for updated bookmarks |
1554 checking for updated bookmarks |
1503 updating the branch cache |
1555 updating the branch cache |
1504 new changesets 1ea73414a91b:44e80141ad53 |
1556 new changesets 1ea73414a91b:44e80141ad53 |
1505 (run 'hg update' to get a working copy) |
1557 (run 'hg update' to get a working copy) |
1506 |
1558 |
|
1559 $ mv newbundles oldbundles |
|
1560 $ ls -1 server/.hg/cache/pullbundles > newbundles |
|
1561 $ diff -u oldbundles newbundles |
|
1562 --- oldbundles * (glob) |
|
1563 +++ newbundles * (glob) |
|
1564 @@ -2,19 +2,26 @@ |
|
1565 02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg |
|
1566 02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg |
|
1567 02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg |
|
1568 +02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg |
|
1569 02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg |
|
1570 02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg |
|
1571 02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg |
|
1572 +02-59e60b258b18cde1e931cf30ce4ae62b49e37abd-0000001520skip-0000000002size.hg |
|
1573 02-5eaa75df73c454c1afff722301a4c73e897de94d-0000001256skip-0000000008size.hg |
|
1574 02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg |
|
1575 +02-7a55a4d5ce324910842c893b56173cf2a847cb9d-0000001472skip-0000000032size.hg |
|
1576 02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg |
|
1577 +02-a4ab7df9d74053fb819c8a1c6a48ad605cc05f8a-0000001504skip-0000000016size.hg |
|
1578 02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg |
|
1579 02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg |
|
1580 +02-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg |
|
1581 02-ca970a853ea24846035ccb324cc8de49ef768748-0000001252skip-0000000004size.hg |
|
1582 02-d1807e3513890ac71c2e8d10e9dc9a5b58b15d4b-0000001251skip-0000000001size.hg |
|
1583 +02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg |
|
1584 02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001235skip-0000000016size.hg |
|
1585 02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg |
|
1586 02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg |
|
1587 +02-dc714c3a5d080165292ba99b097567d0b95e5756-0000001408skip-0000000064size.hg |
|
1588 02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg |
|
1589 02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg |
|
1590 02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg |
|
1591 [1] |
|
1592 |
1507 $ hg -R server log -G -T '{rev}:{node}\n' -r '1789+head()+parents(roots(only(head(), 1789)))+(only(head(), 1789) and (merge() or branchpoint()))' |
1593 $ hg -R server log -G -T '{rev}:{node}\n' -r '1789+head()+parents(roots(only(head(), 1789)))+(only(head(), 1789) and (merge() or branchpoint()))' |
1508 o 2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1 |
1594 o 2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1 |
1509 : |
1595 : |
1510 o 1789:44e80141ad530a2aa085e9bd9b5311b57eff72ff |
1596 o 1789:44e80141ad530a2aa085e9bd9b5311b57eff72ff |
1511 : |
1597 : |
1521 searching for changes |
1607 searching for changes |
1522 all local heads known remotely |
1608 all local heads known remotely |
1523 1 changesets found |
1609 1 changesets found |
1524 4 changesets found |
1610 4 changesets found |
1525 8 changesets found |
1611 8 changesets found |
1526 256 changesets found |
1612 256 changesets found in caches |
1527 64 changesets found |
1613 64 changesets found in caches |
1528 8 changesets found |
1614 8 changesets found in caches |
1529 1 changesets found |
1615 1 changesets found in caches |
1530 4 changesets found |
1616 4 changesets found in caches |
1531 8 changesets found |
1617 8 changesets found in caches |
1532 16 changesets found |
1618 16 changesets found in caches |
1533 128 changesets found |
1619 128 changesets found in caches |
1534 64 changesets found |
1620 64 changesets found in caches |
1535 32 changesets found |
1621 32 changesets found in caches |
1536 8 changesets found |
1622 8 changesets found in caches |
1537 4 changesets found |
1623 4 changesets found in caches |
1538 2 changesets found |
1624 2 changesets found in caches |
1539 listing keys for "bookmarks" |
1625 listing keys for "bookmarks" |
1540 bundle2-output-bundle: "HG20", 19 parts total |
1626 bundle2-output-bundle: "HG20", 19 parts total |
1541 bundle2-output: start emission of HG20 stream |
1627 bundle2-output: start emission of HG20 stream |
1542 bundle2-output: bundle parameter: |
1628 bundle2-output: bundle parameter: |
1543 bundle2-output: start of parts |
1629 bundle2-output: start of parts |
1899 bundle2-input-bundle: 18 parts total |
1985 bundle2-input-bundle: 18 parts total |
1900 checking for updated bookmarks |
1986 checking for updated bookmarks |
1901 updating the branch cache |
1987 updating the branch cache |
1902 new changesets c232505f58fd:1dded5aafa0f |
1988 new changesets c232505f58fd:1dded5aafa0f |
1903 (run 'hg heads' to see heads, 'hg merge' to merge) |
1989 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
1990 |
|
1991 $ mv newbundles oldbundles |
|
1992 $ ls -1 server/.hg/cache/pullbundles > newbundles |
|
1993 $ diff -u oldbundles newbundles |
|
1994 --- oldbundles * (glob) |
|
1995 +++ newbundles * (glob) |
|
1996 @@ -1,5 +1,6 @@ |
|
1997 02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg |
|
1998 02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg |
|
1999 +02-1ed78f99f705cb819a02f1227c217728d008e461-0000001524skip-0000000004size.hg |
|
2000 02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg |
|
2001 02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg |
|
2002 02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg |
|
2003 @@ -15,6 +16,7 @@ |
|
2004 02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg |
|
2005 02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg |
|
2006 02-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg |
|
2007 +02-c232505f58fdf70bcf5f6ab6a555f23ffc74f761-0000001523skip-0000000001size.hg |
|
2008 02-ca970a853ea24846035ccb324cc8de49ef768748-0000001252skip-0000000004size.hg |
|
2009 02-d1807e3513890ac71c2e8d10e9dc9a5b58b15d4b-0000001251skip-0000000001size.hg |
|
2010 02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg |
|
2011 @@ -24,6 +26,7 @@ |
|
2012 02-dc714c3a5d080165292ba99b097567d0b95e5756-0000001408skip-0000000064size.hg |
|
2013 02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg |
|
2014 02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg |
|
2015 +02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001528skip-0000000008size.hg |
|
2016 02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg |
|
2017 02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg |
|
2018 02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg |
|
2019 [1] |