tests/test-push-race.t
changeset 34661 eb586ed5d8ce
parent 34507 30ae924a9e00
child 34767 6338e23c887d
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
   135   requesting all changes
   135   requesting all changes
   136   adding changesets
   136   adding changesets
   137   adding manifests
   137   adding manifests
   138   adding file changes
   138   adding file changes
   139   added 1 changesets with 1 changes to 1 files
   139   added 1 changesets with 1 changes to 1 files
       
   140   new changesets 842e2fac6304
   140   updating to branch default
   141   updating to branch default
   141   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   142   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   142   $ hg clone ssh://user@dummy/server client-other
   143   $ hg clone ssh://user@dummy/server client-other
   143   requesting all changes
   144   requesting all changes
   144   adding changesets
   145   adding changesets
   145   adding manifests
   146   adding manifests
   146   adding file changes
   147   adding file changes
   147   added 1 changesets with 1 changes to 1 files
   148   added 1 changesets with 1 changes to 1 files
       
   149   new changesets 842e2fac6304
   148   updating to branch default
   150   updating to branch default
   149   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   151   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   150 
   152 
   151 setup one to allow race on push
   153 setup one to allow race on push
   152 
   154 
   227   searching for changes
   229   searching for changes
   228   adding changesets
   230   adding changesets
   229   adding manifests
   231   adding manifests
   230   adding file changes
   232   adding file changes
   231   added 1 changesets with 1 changes to 1 files (+1 heads)
   233   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   234   new changesets a9149a1428e2
   232   (run 'hg heads' to see heads, 'hg merge' to merge)
   235   (run 'hg heads' to see heads, 'hg merge' to merge)
   233   $ hg -R ./client-other pull
   236   $ hg -R ./client-other pull
   234   pulling from ssh://user@dummy/server
   237   pulling from ssh://user@dummy/server
   235   searching for changes
   238   searching for changes
   236   adding changesets
   239   adding changesets
   237   adding manifests
   240   adding manifests
   238   adding file changes
   241   adding file changes
   239   added 1 changesets with 1 changes to 1 files (+1 heads)
   242   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   243   new changesets a9149a1428e2
   240   (run 'hg heads' to see heads, 'hg merge' to merge)
   244   (run 'hg heads' to see heads, 'hg merge' to merge)
   241   $ hg -R ./client-racy pull
   245   $ hg -R ./client-racy pull
   242   pulling from ssh://user@dummy/server
   246   pulling from ssh://user@dummy/server
   243   searching for changes
   247   searching for changes
   244   adding changesets
   248   adding changesets
   245   adding manifests
   249   adding manifests
   246   adding file changes
   250   adding file changes
   247   added 1 changesets with 1 changes to 1 files (+1 heads)
   251   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   252   new changesets 98217d5a1659
   248   (run 'hg heads' to see heads, 'hg merge' to merge)
   253   (run 'hg heads' to see heads, 'hg merge' to merge)
   249 
   254 
   250   $ hg -R server graph
   255   $ hg -R server graph
   251   o  a9149a1428e2 C-B (default)
   256   o  a9149a1428e2 C-B (default)
   252   |
   257   |
   346   searching for changes
   351   searching for changes
   347   adding changesets
   352   adding changesets
   348   adding manifests
   353   adding manifests
   349   adding file changes
   354   adding file changes
   350   added 1 changesets with 1 changes to 1 files
   355   added 1 changesets with 1 changes to 1 files
       
   356   new changesets 59e76faf78bd
   351   (run 'hg update' to get a working copy)
   357   (run 'hg update' to get a working copy)
   352 
   358 
   353 #endif
   359 #endif
   354 #if unrelated
   360 #if unrelated
   355 
   361 
   365   searching for changes
   371   searching for changes
   366   adding changesets
   372   adding changesets
   367   adding manifests
   373   adding manifests
   368   adding file changes
   374   adding file changes
   369   added 1 changesets with 1 changes to 1 files
   375   added 1 changesets with 1 changes to 1 files
       
   376   new changesets 59e76faf78bd
   370   (run 'hg update' to get a working copy)
   377   (run 'hg update' to get a working copy)
   371   $ hg -R ./client-racy pull
   378   $ hg -R ./client-racy pull
   372   pulling from ssh://user@dummy/server
   379   pulling from ssh://user@dummy/server
   373   searching for changes
   380   searching for changes
   374   adding changesets
   381   adding changesets
   375   adding manifests
   382   adding manifests
   376   adding file changes
   383   adding file changes
   377   added 1 changesets with 1 changes to 1 files
   384   added 1 changesets with 1 changes to 1 files
       
   385   new changesets 51c544a58128
   378   (run 'hg update' to get a working copy)
   386   (run 'hg update' to get a working copy)
   379 
   387 
   380   $ hg -R server graph
   388   $ hg -R server graph
   381   o  59e76faf78bd C-D (default)
   389   o  59e76faf78bd C-D (default)
   382   |
   390   |
   501   searching for changes
   509   searching for changes
   502   adding changesets
   510   adding changesets
   503   adding manifests
   511   adding manifests
   504   adding file changes
   512   adding file changes
   505   added 1 changesets with 1 changes to 1 files
   513   added 1 changesets with 1 changes to 1 files
       
   514   new changesets d9e379a8c432
   506   (run 'hg update' to get a working copy)
   515   (run 'hg update' to get a working copy)
   507 
   516 
   508 #endif
   517 #endif
   509 #if unrelated
   518 #if unrelated
   510 
   519 
   520   searching for changes
   529   searching for changes
   521   adding changesets
   530   adding changesets
   522   adding manifests
   531   adding manifests
   523   adding file changes
   532   adding file changes
   524   added 1 changesets with 1 changes to 1 files
   533   added 1 changesets with 1 changes to 1 files
       
   534   new changesets d9e379a8c432
   525   (run 'hg update' to get a working copy)
   535   (run 'hg update' to get a working copy)
   526   $ hg -R ./client-racy pull
   536   $ hg -R ./client-racy pull
   527   pulling from ssh://user@dummy/server
   537   pulling from ssh://user@dummy/server
   528   searching for changes
   538   searching for changes
   529   adding changesets
   539   adding changesets
   530   adding manifests
   540   adding manifests
   531   adding file changes
   541   adding file changes
   532   added 1 changesets with 1 changes to 1 files (+1 heads)
   542   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   543   new changesets d603e2c0cdd7
   533   (run 'hg heads .' to see heads, 'hg merge' to merge)
   544   (run 'hg heads .' to see heads, 'hg merge' to merge)
   534 
   545 
   535   $ hg -R server graph
   546   $ hg -R server graph
   536   o  d9e379a8c432 C-F (default)
   547   o  d9e379a8c432 C-F (default)
   537   |
   548   |
   669   searching for changes
   680   searching for changes
   670   adding changesets
   681   adding changesets
   671   adding manifests
   682   adding manifests
   672   adding file changes
   683   adding file changes
   673   added 1 changesets with 1 changes to 1 files (+1 heads)
   684   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   685   new changesets 833be552cfe6
   674   (run 'hg heads .' to see heads, 'hg merge' to merge)
   686   (run 'hg heads .' to see heads, 'hg merge' to merge)
   675 
   687 
   676 #endif
   688 #endif
   677 #if unrelated
   689 #if unrelated
   678 
   690 
   688   searching for changes
   700   searching for changes
   689   adding changesets
   701   adding changesets
   690   adding manifests
   702   adding manifests
   691   adding file changes
   703   adding file changes
   692   added 1 changesets with 1 changes to 1 files (+1 heads)
   704   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   705   new changesets 833be552cfe6
   693   (run 'hg heads .' to see heads, 'hg merge' to merge)
   706   (run 'hg heads .' to see heads, 'hg merge' to merge)
   694   $ hg -R ./client-racy pull
   707   $ hg -R ./client-racy pull
   695   pulling from ssh://user@dummy/server
   708   pulling from ssh://user@dummy/server
   696   searching for changes
   709   searching for changes
   697   adding changesets
   710   adding changesets
   698   adding manifests
   711   adding manifests
   699   adding file changes
   712   adding file changes
   700   added 1 changesets with 1 changes to 1 files (+1 heads)
   713   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   714   new changesets 75d69cba5402
   701   (run 'hg heads' to see heads)
   715   (run 'hg heads' to see heads)
   702 
   716 
   703   $ hg -R server graph
   717   $ hg -R server graph
   704   o  833be552cfe6 C-H (my-first-test-branch)
   718   o  833be552cfe6 C-H (my-first-test-branch)
   705   |
   719   |
   851   searching for changes
   865   searching for changes
   852   adding changesets
   866   adding changesets
   853   adding manifests
   867   adding manifests
   854   adding file changes
   868   adding file changes
   855   added 1 changesets with 1 changes to 1 files (+1 heads)
   869   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   870   new changesets 89420bf00fae
   856   (run 'hg heads .' to see heads, 'hg merge' to merge)
   871   (run 'hg heads .' to see heads, 'hg merge' to merge)
   857 
   872 
   858 #endif
   873 #endif
   859 
   874 
   860 #if unrelated
   875 #if unrelated
   871   searching for changes
   886   searching for changes
   872   adding changesets
   887   adding changesets
   873   adding manifests
   888   adding manifests
   874   adding file changes
   889   adding file changes
   875   added 1 changesets with 1 changes to 1 files (+1 heads)
   890   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   891   new changesets 89420bf00fae
   876   (run 'hg heads' to see heads)
   892   (run 'hg heads' to see heads)
   877   $ hg -R ./client-racy pull
   893   $ hg -R ./client-racy pull
   878   pulling from ssh://user@dummy/server
   894   pulling from ssh://user@dummy/server
   879   searching for changes
   895   searching for changes
   880   adding changesets
   896   adding changesets
   881   adding manifests
   897   adding manifests
   882   adding file changes
   898   adding file changes
   883   added 1 changesets with 1 changes to 1 files (+1 heads)
   899   added 1 changesets with 1 changes to 1 files (+1 heads)
       
   900   new changesets b35ed749f288
   884   (run 'hg heads .' to see heads, 'hg merge' to merge)
   901   (run 'hg heads .' to see heads, 'hg merge' to merge)
   885 
   902 
   886   $ hg -R server graph
   903   $ hg -R server graph
   887   o  89420bf00fae C-J (default)
   904   o  89420bf00fae C-J (default)
   888   |
   905   |
   996   searching for changes
  1013   searching for changes
   997   adding changesets
  1014   adding changesets
   998   adding manifests
  1015   adding manifests
   999   adding file changes
  1016   adding file changes
  1000   added 1 changesets with 1 changes to 1 files (+1 heads)
  1017   added 1 changesets with 1 changes to 1 files (+1 heads)
       
  1018   new changesets cac2cead0ff0
  1001   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1019   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1002   $ hg -R ./client-other pull
  1020   $ hg -R ./client-other pull
  1003   pulling from ssh://user@dummy/server
  1021   pulling from ssh://user@dummy/server
  1004   searching for changes
  1022   searching for changes
  1005   adding changesets
  1023   adding changesets
  1006   adding manifests
  1024   adding manifests
  1007   adding file changes
  1025   adding file changes
  1008   added 1 changesets with 1 changes to 1 files (+1 heads)
  1026   added 1 changesets with 1 changes to 1 files (+1 heads)
       
  1027   new changesets cac2cead0ff0
  1009   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1028   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1010   $ hg -R ./client-racy pull
  1029   $ hg -R ./client-racy pull
  1011   pulling from ssh://user@dummy/server
  1030   pulling from ssh://user@dummy/server
  1012   searching for changes
  1031   searching for changes
  1013   adding changesets
  1032   adding changesets
  1014   adding manifests
  1033   adding manifests
  1015   adding file changes
  1034   adding file changes
  1016   added 1 changesets with 0 changes to 0 files
  1035   added 1 changesets with 0 changes to 0 files
       
  1036   new changesets be705100c623
  1017   (run 'hg update' to get a working copy)
  1037   (run 'hg update' to get a working copy)
  1018 
  1038 
  1019   $ hg -R server graph
  1039   $ hg -R server graph
  1020   o  cac2cead0ff0 C-L (default)
  1040   o  cac2cead0ff0 C-L (default)
  1021   |
  1041   |
  1136   searching for changes
  1156   searching for changes
  1137   adding changesets
  1157   adding changesets
  1138   adding manifests
  1158   adding manifests
  1139   adding file changes
  1159   adding file changes
  1140   added 1 changesets with 0 changes to 0 files
  1160   added 1 changesets with 0 changes to 0 files
       
  1161   new changesets 866a66e18630
  1141   (run 'hg update' to get a working copy)
  1162   (run 'hg update' to get a working copy)
  1142 
  1163 
  1143 (creates named branch on head)
  1164 (creates named branch on head)
  1144 
  1165 
  1145   $ hg -R ./server/ up 'desc("C-N")'
  1166   $ hg -R ./server/ up 'desc("C-N")'
  1157   searching for changes
  1178   searching for changes
  1158   adding changesets
  1179   adding changesets
  1159   adding manifests
  1180   adding manifests
  1160   adding file changes
  1181   adding file changes
  1161   added 2 changesets with 0 changes to 0 files
  1182   added 2 changesets with 0 changes to 0 files
       
  1183   new changesets 866a66e18630:55a6f1c01b48
  1162   (run 'hg update' to get a working copy)
  1184   (run 'hg update' to get a working copy)
  1163   $ hg -R ./client-racy pull
  1185   $ hg -R ./client-racy pull
  1164   pulling from ssh://user@dummy/server
  1186   pulling from ssh://user@dummy/server
  1165   searching for changes
  1187   searching for changes
  1166   adding changesets
  1188   adding changesets
  1167   adding manifests
  1189   adding manifests
  1168   adding file changes
  1190   adding file changes
  1169   added 2 changesets with 1 changes to 1 files (+1 heads)
  1191   added 2 changesets with 1 changes to 1 files (+1 heads)
       
  1192   new changesets 6fd3090135df:55a6f1c01b48
  1170   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1193   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1171 
  1194 
  1172   $ hg -R server graph
  1195   $ hg -R server graph
  1173   o  55a6f1c01b48 C-Z (other)
  1196   o  55a6f1c01b48 C-Z (other)
  1174   |
  1197   |
  1313   searching for changes
  1336   searching for changes
  1314   adding changesets
  1337   adding changesets
  1315   adding manifests
  1338   adding manifests
  1316   adding file changes
  1339   adding file changes
  1317   added 1 changesets with 0 changes to 0 files (+1 heads)
  1340   added 1 changesets with 0 changes to 0 files (+1 heads)
       
  1341   new changesets b0ee3d6f51bc
  1318   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1342   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1319   $ hg -R ./client-other pull
  1343   $ hg -R ./client-other pull
  1320   pulling from ssh://user@dummy/server
  1344   pulling from ssh://user@dummy/server
  1321   searching for changes
  1345   searching for changes
  1322   adding changesets
  1346   adding changesets
  1323   adding manifests
  1347   adding manifests
  1324   adding file changes
  1348   adding file changes
  1325   added 1 changesets with 0 changes to 0 files (+1 heads)
  1349   added 1 changesets with 0 changes to 0 files (+1 heads)
       
  1350   new changesets b0ee3d6f51bc
  1326   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1351   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1327   $ hg -R ./client-racy pull
  1352   $ hg -R ./client-racy pull
  1328   pulling from ssh://user@dummy/server
  1353   pulling from ssh://user@dummy/server
  1329   searching for changes
  1354   searching for changes
  1330   adding changesets
  1355   adding changesets
  1331   adding manifests
  1356   adding manifests
  1332   adding file changes
  1357   adding file changes
  1333   added 2 changesets with 1 changes to 1 files (+1 heads)
  1358   added 2 changesets with 1 changes to 1 files (+1 heads)
       
  1359   new changesets d0a85b2252a9:1b58ee3f79e5
  1334   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1360   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1335 
  1361 
  1336   $ hg -R server graph
  1362   $ hg -R server graph
  1337   o  b0ee3d6f51bc C-Q (default)
  1363   o  b0ee3d6f51bc C-Q (default)
  1338   |
  1364   |
  1481   searching for changes
  1507   searching for changes
  1482   adding changesets
  1508   adding changesets
  1483   adding manifests
  1509   adding manifests
  1484   adding file changes
  1510   adding file changes
  1485   added 2 changesets with 2 changes to 1 files (+1 heads)
  1511   added 2 changesets with 2 changes to 1 files (+1 heads)
       
  1512   new changesets 2efd43f7b5ba:3d57ed3c1091
  1486   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1513   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1487   $ hg -R ./client-other pull
  1514   $ hg -R ./client-other pull
  1488   pulling from ssh://user@dummy/server
  1515   pulling from ssh://user@dummy/server
  1489   searching for changes
  1516   searching for changes
  1490   adding changesets
  1517   adding changesets
  1491   adding manifests
  1518   adding manifests
  1492   adding file changes
  1519   adding file changes
  1493   added 2 changesets with 2 changes to 1 files (+1 heads)
  1520   added 2 changesets with 2 changes to 1 files (+1 heads)
       
  1521   new changesets 2efd43f7b5ba:3d57ed3c1091
  1494   (run 'hg heads' to see heads, 'hg merge' to merge)
  1522   (run 'hg heads' to see heads, 'hg merge' to merge)
  1495   $ hg -R ./client-racy pull
  1523   $ hg -R ./client-racy pull
  1496   pulling from ssh://user@dummy/server
  1524   pulling from ssh://user@dummy/server
  1497   searching for changes
  1525   searching for changes
  1498   adding changesets
  1526   adding changesets
  1499   adding manifests
  1527   adding manifests
  1500   adding file changes
  1528   adding file changes
  1501   added 1 changesets with 1 changes to 1 files (+1 heads)
  1529   added 1 changesets with 1 changes to 1 files (+1 heads)
       
  1530   new changesets de7b9e2ba3f6
  1502   (run 'hg heads' to see heads, 'hg merge' to merge)
  1531   (run 'hg heads' to see heads, 'hg merge' to merge)
  1503 
  1532 
  1504   $ hg -R server graph
  1533   $ hg -R server graph
  1505   o  3d57ed3c1091 C-T (other)
  1534   o  3d57ed3c1091 C-T (other)
  1506   |
  1535   |
  1665   adding manifests
  1694   adding manifests
  1666   adding file changes
  1695   adding file changes
  1667   added 1 changesets with 1 changes to 1 files (+1 heads)
  1696   added 1 changesets with 1 changes to 1 files (+1 heads)
  1668   1 new obsolescence markers
  1697   1 new obsolescence markers
  1669   obsoleted 1 changesets
  1698   obsoleted 1 changesets
       
  1699   new changesets 720c5163ecf6
  1670   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1700   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1671   $ hg -R ./client-other pull
  1701   $ hg -R ./client-other pull
  1672   pulling from ssh://user@dummy/server
  1702   pulling from ssh://user@dummy/server
  1673   searching for changes
  1703   searching for changes
  1674   adding changesets
  1704   adding changesets
  1675   adding manifests
  1705   adding manifests
  1676   adding file changes
  1706   adding file changes
  1677   added 1 changesets with 1 changes to 1 files (+1 heads)
  1707   added 1 changesets with 1 changes to 1 files (+1 heads)
  1678   1 new obsolescence markers
  1708   1 new obsolescence markers
  1679   obsoleted 1 changesets
  1709   obsoleted 1 changesets
       
  1710   new changesets 720c5163ecf6
  1680   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1711   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1681   $ hg -R ./client-racy pull
  1712   $ hg -R ./client-racy pull
  1682   pulling from ssh://user@dummy/server
  1713   pulling from ssh://user@dummy/server
  1683   searching for changes
  1714   searching for changes
  1684   adding changesets
  1715   adding changesets
  1685   adding manifests
  1716   adding manifests
  1686   adding file changes
  1717   adding file changes
  1687   added 1 changesets with 0 changes to 0 files
  1718   added 1 changesets with 0 changes to 0 files
       
  1719   new changesets a98a47d8b85b
  1688   (run 'hg update' to get a working copy)
  1720   (run 'hg update' to get a working copy)
  1689 
  1721 
  1690   $ hg -R server debugobsolete
  1722   $ hg -R server debugobsolete
  1691   b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
  1723   b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
  1692   $ hg -R server graph
  1724   $ hg -R server graph