tests/test-push-race.t
changeset 39480 89630d0b3e23
parent 35709 1a09dad8b85a
child 39707 5abc47d4ca6b
equal deleted inserted replaced
39479:3ba87d5b9ad3 39480:89630d0b3e23
   146   requesting all changes
   146   requesting all changes
   147   adding changesets
   147   adding changesets
   148   adding manifests
   148   adding manifests
   149   adding file changes
   149   adding file changes
   150   added 1 changesets with 1 changes to 1 files
   150   added 1 changesets with 1 changes to 1 files
   151   new changesets 842e2fac6304
   151   new changesets 842e2fac6304 (1 drafts)
   152   updating to branch default
   152   updating to branch default
   153   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   153   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   154   $ hg clone ssh://user@dummy/server client-other
   154   $ hg clone ssh://user@dummy/server client-other
   155   requesting all changes
   155   requesting all changes
   156   adding changesets
   156   adding changesets
   157   adding manifests
   157   adding manifests
   158   adding file changes
   158   adding file changes
   159   added 1 changesets with 1 changes to 1 files
   159   added 1 changesets with 1 changes to 1 files
   160   new changesets 842e2fac6304
   160   new changesets 842e2fac6304 (1 drafts)
   161   updating to branch default
   161   updating to branch default
   162   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   162   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   163 
   163 
   164 setup one to allow race on push
   164 setup one to allow race on push
   165 
   165 
   240   searching for changes
   240   searching for changes
   241   adding changesets
   241   adding changesets
   242   adding manifests
   242   adding manifests
   243   adding file changes
   243   adding file changes
   244   added 1 changesets with 1 changes to 1 files (+1 heads)
   244   added 1 changesets with 1 changes to 1 files (+1 heads)
   245   new changesets a9149a1428e2
   245   new changesets a9149a1428e2 (1 drafts)
   246   (run 'hg heads' to see heads, 'hg merge' to merge)
   246   (run 'hg heads' to see heads, 'hg merge' to merge)
   247   $ hg -R ./client-other pull
   247   $ hg -R ./client-other pull
   248   pulling from ssh://user@dummy/server
   248   pulling from ssh://user@dummy/server
   249   searching for changes
   249   searching for changes
   250   adding changesets
   250   adding changesets
   251   adding manifests
   251   adding manifests
   252   adding file changes
   252   adding file changes
   253   added 1 changesets with 1 changes to 1 files (+1 heads)
   253   added 1 changesets with 1 changes to 1 files (+1 heads)
   254   new changesets a9149a1428e2
   254   new changesets a9149a1428e2 (1 drafts)
   255   (run 'hg heads' to see heads, 'hg merge' to merge)
   255   (run 'hg heads' to see heads, 'hg merge' to merge)
   256   $ hg -R ./client-racy pull
   256   $ hg -R ./client-racy pull
   257   pulling from ssh://user@dummy/server
   257   pulling from ssh://user@dummy/server
   258   searching for changes
   258   searching for changes
   259   adding changesets
   259   adding changesets
   260   adding manifests
   260   adding manifests
   261   adding file changes
   261   adding file changes
   262   added 1 changesets with 1 changes to 1 files (+1 heads)
   262   added 1 changesets with 1 changes to 1 files (+1 heads)
   263   new changesets 98217d5a1659
   263   new changesets 98217d5a1659 (1 drafts)
   264   (run 'hg heads' to see heads, 'hg merge' to merge)
   264   (run 'hg heads' to see heads, 'hg merge' to merge)
   265 
   265 
   266   $ hg -R server graph
   266   $ hg -R server graph
   267   o  a9149a1428e2 C-B (default)
   267   o  a9149a1428e2 C-B (default)
   268   |
   268   |
   362   searching for changes
   362   searching for changes
   363   adding changesets
   363   adding changesets
   364   adding manifests
   364   adding manifests
   365   adding file changes
   365   adding file changes
   366   added 1 changesets with 1 changes to 1 files
   366   added 1 changesets with 1 changes to 1 files
   367   new changesets 59e76faf78bd
   367   new changesets 59e76faf78bd (1 drafts)
   368   (run 'hg update' to get a working copy)
   368   (run 'hg update' to get a working copy)
   369 
   369 
   370 #endif
   370 #endif
   371 #if unrelated
   371 #if unrelated
   372 
   372 
   382   searching for changes
   382   searching for changes
   383   adding changesets
   383   adding changesets
   384   adding manifests
   384   adding manifests
   385   adding file changes
   385   adding file changes
   386   added 1 changesets with 1 changes to 1 files
   386   added 1 changesets with 1 changes to 1 files
   387   new changesets 59e76faf78bd
   387   new changesets 59e76faf78bd (1 drafts)
   388   (run 'hg update' to get a working copy)
   388   (run 'hg update' to get a working copy)
   389   $ hg -R ./client-racy pull
   389   $ hg -R ./client-racy pull
   390   pulling from ssh://user@dummy/server
   390   pulling from ssh://user@dummy/server
   391   searching for changes
   391   searching for changes
   392   adding changesets
   392   adding changesets
   393   adding manifests
   393   adding manifests
   394   adding file changes
   394   adding file changes
   395   added 1 changesets with 1 changes to 1 files
   395   added 1 changesets with 1 changes to 1 files
   396   new changesets 51c544a58128
   396   new changesets 51c544a58128 (1 drafts)
   397   (run 'hg update' to get a working copy)
   397   (run 'hg update' to get a working copy)
   398 
   398 
   399   $ hg -R server graph
   399   $ hg -R server graph
   400   o  59e76faf78bd C-D (default)
   400   o  59e76faf78bd C-D (default)
   401   |
   401   |
   520   searching for changes
   520   searching for changes
   521   adding changesets
   521   adding changesets
   522   adding manifests
   522   adding manifests
   523   adding file changes
   523   adding file changes
   524   added 1 changesets with 1 changes to 1 files
   524   added 1 changesets with 1 changes to 1 files
   525   new changesets d9e379a8c432
   525   new changesets d9e379a8c432 (1 drafts)
   526   (run 'hg update' to get a working copy)
   526   (run 'hg update' to get a working copy)
   527 
   527 
   528 #endif
   528 #endif
   529 #if unrelated
   529 #if unrelated
   530 
   530 
   540   searching for changes
   540   searching for changes
   541   adding changesets
   541   adding changesets
   542   adding manifests
   542   adding manifests
   543   adding file changes
   543   adding file changes
   544   added 1 changesets with 1 changes to 1 files
   544   added 1 changesets with 1 changes to 1 files
   545   new changesets d9e379a8c432
   545   new changesets d9e379a8c432 (1 drafts)
   546   (run 'hg update' to get a working copy)
   546   (run 'hg update' to get a working copy)
   547   $ hg -R ./client-racy pull
   547   $ hg -R ./client-racy pull
   548   pulling from ssh://user@dummy/server
   548   pulling from ssh://user@dummy/server
   549   searching for changes
   549   searching for changes
   550   adding changesets
   550   adding changesets
   551   adding manifests
   551   adding manifests
   552   adding file changes
   552   adding file changes
   553   added 1 changesets with 1 changes to 1 files (+1 heads)
   553   added 1 changesets with 1 changes to 1 files (+1 heads)
   554   new changesets d603e2c0cdd7
   554   new changesets d603e2c0cdd7 (1 drafts)
   555   (run 'hg heads .' to see heads, 'hg merge' to merge)
   555   (run 'hg heads .' to see heads, 'hg merge' to merge)
   556 
   556 
   557   $ hg -R server graph
   557   $ hg -R server graph
   558   o  d9e379a8c432 C-F (default)
   558   o  d9e379a8c432 C-F (default)
   559   |
   559   |
   691   searching for changes
   691   searching for changes
   692   adding changesets
   692   adding changesets
   693   adding manifests
   693   adding manifests
   694   adding file changes
   694   adding file changes
   695   added 1 changesets with 1 changes to 1 files (+1 heads)
   695   added 1 changesets with 1 changes to 1 files (+1 heads)
   696   new changesets 833be552cfe6
   696   new changesets 833be552cfe6 (1 drafts)
   697   (run 'hg heads .' to see heads, 'hg merge' to merge)
   697   (run 'hg heads .' to see heads, 'hg merge' to merge)
   698 
   698 
   699 #endif
   699 #endif
   700 #if unrelated
   700 #if unrelated
   701 
   701 
   711   searching for changes
   711   searching for changes
   712   adding changesets
   712   adding changesets
   713   adding manifests
   713   adding manifests
   714   adding file changes
   714   adding file changes
   715   added 1 changesets with 1 changes to 1 files (+1 heads)
   715   added 1 changesets with 1 changes to 1 files (+1 heads)
   716   new changesets 833be552cfe6
   716   new changesets 833be552cfe6 (1 drafts)
   717   (run 'hg heads .' to see heads, 'hg merge' to merge)
   717   (run 'hg heads .' to see heads, 'hg merge' to merge)
   718   $ hg -R ./client-racy pull
   718   $ hg -R ./client-racy pull
   719   pulling from ssh://user@dummy/server
   719   pulling from ssh://user@dummy/server
   720   searching for changes
   720   searching for changes
   721   adding changesets
   721   adding changesets
   722   adding manifests
   722   adding manifests
   723   adding file changes
   723   adding file changes
   724   added 1 changesets with 1 changes to 1 files (+1 heads)
   724   added 1 changesets with 1 changes to 1 files (+1 heads)
   725   new changesets 75d69cba5402
   725   new changesets 75d69cba5402 (1 drafts)
   726   (run 'hg heads' to see heads)
   726   (run 'hg heads' to see heads)
   727 
   727 
   728   $ hg -R server graph
   728   $ hg -R server graph
   729   o  833be552cfe6 C-H (my-first-test-branch)
   729   o  833be552cfe6 C-H (my-first-test-branch)
   730   |
   730   |
   876   searching for changes
   876   searching for changes
   877   adding changesets
   877   adding changesets
   878   adding manifests
   878   adding manifests
   879   adding file changes
   879   adding file changes
   880   added 1 changesets with 1 changes to 1 files (+1 heads)
   880   added 1 changesets with 1 changes to 1 files (+1 heads)
   881   new changesets 89420bf00fae
   881   new changesets 89420bf00fae (1 drafts)
   882   (run 'hg heads .' to see heads, 'hg merge' to merge)
   882   (run 'hg heads .' to see heads, 'hg merge' to merge)
   883 
   883 
   884 #endif
   884 #endif
   885 
   885 
   886 #if unrelated
   886 #if unrelated
   897   searching for changes
   897   searching for changes
   898   adding changesets
   898   adding changesets
   899   adding manifests
   899   adding manifests
   900   adding file changes
   900   adding file changes
   901   added 1 changesets with 1 changes to 1 files (+1 heads)
   901   added 1 changesets with 1 changes to 1 files (+1 heads)
   902   new changesets 89420bf00fae
   902   new changesets 89420bf00fae (1 drafts)
   903   (run 'hg heads' to see heads)
   903   (run 'hg heads' to see heads)
   904   $ hg -R ./client-racy pull
   904   $ hg -R ./client-racy pull
   905   pulling from ssh://user@dummy/server
   905   pulling from ssh://user@dummy/server
   906   searching for changes
   906   searching for changes
   907   adding changesets
   907   adding changesets
   908   adding manifests
   908   adding manifests
   909   adding file changes
   909   adding file changes
   910   added 1 changesets with 1 changes to 1 files (+1 heads)
   910   added 1 changesets with 1 changes to 1 files (+1 heads)
   911   new changesets b35ed749f288
   911   new changesets b35ed749f288 (1 drafts)
   912   (run 'hg heads .' to see heads, 'hg merge' to merge)
   912   (run 'hg heads .' to see heads, 'hg merge' to merge)
   913 
   913 
   914   $ hg -R server graph
   914   $ hg -R server graph
   915   o  89420bf00fae C-J (default)
   915   o  89420bf00fae C-J (default)
   916   |
   916   |
  1024   searching for changes
  1024   searching for changes
  1025   adding changesets
  1025   adding changesets
  1026   adding manifests
  1026   adding manifests
  1027   adding file changes
  1027   adding file changes
  1028   added 1 changesets with 1 changes to 1 files (+1 heads)
  1028   added 1 changesets with 1 changes to 1 files (+1 heads)
  1029   new changesets cac2cead0ff0
  1029   new changesets cac2cead0ff0 (1 drafts)
  1030   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1030   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1031   $ hg -R ./client-other pull
  1031   $ hg -R ./client-other pull
  1032   pulling from ssh://user@dummy/server
  1032   pulling from ssh://user@dummy/server
  1033   searching for changes
  1033   searching for changes
  1034   adding changesets
  1034   adding changesets
  1035   adding manifests
  1035   adding manifests
  1036   adding file changes
  1036   adding file changes
  1037   added 1 changesets with 1 changes to 1 files (+1 heads)
  1037   added 1 changesets with 1 changes to 1 files (+1 heads)
  1038   new changesets cac2cead0ff0
  1038   new changesets cac2cead0ff0 (1 drafts)
  1039   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1039   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1040   $ hg -R ./client-racy pull
  1040   $ hg -R ./client-racy pull
  1041   pulling from ssh://user@dummy/server
  1041   pulling from ssh://user@dummy/server
  1042   searching for changes
  1042   searching for changes
  1043   adding changesets
  1043   adding changesets
  1044   adding manifests
  1044   adding manifests
  1045   adding file changes
  1045   adding file changes
  1046   added 1 changesets with 0 changes to 0 files
  1046   added 1 changesets with 0 changes to 0 files
  1047   new changesets be705100c623
  1047   new changesets be705100c623 (1 drafts)
  1048   (run 'hg update' to get a working copy)
  1048   (run 'hg update' to get a working copy)
  1049 
  1049 
  1050   $ hg -R server graph
  1050   $ hg -R server graph
  1051   o  cac2cead0ff0 C-L (default)
  1051   o  cac2cead0ff0 C-L (default)
  1052   |
  1052   |
  1167   searching for changes
  1167   searching for changes
  1168   adding changesets
  1168   adding changesets
  1169   adding manifests
  1169   adding manifests
  1170   adding file changes
  1170   adding file changes
  1171   added 1 changesets with 0 changes to 0 files
  1171   added 1 changesets with 0 changes to 0 files
  1172   new changesets 866a66e18630
  1172   new changesets 866a66e18630 (1 drafts)
  1173   (run 'hg update' to get a working copy)
  1173   (run 'hg update' to get a working copy)
  1174 
  1174 
  1175 (creates named branch on head)
  1175 (creates named branch on head)
  1176 
  1176 
  1177   $ hg -R ./server/ up 'desc("C-N")'
  1177   $ hg -R ./server/ up 'desc("C-N")'
  1189   searching for changes
  1189   searching for changes
  1190   adding changesets
  1190   adding changesets
  1191   adding manifests
  1191   adding manifests
  1192   adding file changes
  1192   adding file changes
  1193   added 2 changesets with 0 changes to 0 files
  1193   added 2 changesets with 0 changes to 0 files
  1194   new changesets 866a66e18630:55a6f1c01b48
  1194   new changesets 866a66e18630:55a6f1c01b48 (2 drafts)
  1195   (run 'hg update' to get a working copy)
  1195   (run 'hg update' to get a working copy)
  1196   $ hg -R ./client-racy pull
  1196   $ hg -R ./client-racy pull
  1197   pulling from ssh://user@dummy/server
  1197   pulling from ssh://user@dummy/server
  1198   searching for changes
  1198   searching for changes
  1199   adding changesets
  1199   adding changesets
  1200   adding manifests
  1200   adding manifests
  1201   adding file changes
  1201   adding file changes
  1202   added 2 changesets with 1 changes to 1 files (+1 heads)
  1202   added 2 changesets with 1 changes to 1 files (+1 heads)
  1203   new changesets 6fd3090135df:55a6f1c01b48
  1203   new changesets 6fd3090135df:55a6f1c01b48 (2 drafts)
  1204   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1204   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1205 
  1205 
  1206   $ hg -R server graph
  1206   $ hg -R server graph
  1207   o  55a6f1c01b48 C-Z (other)
  1207   o  55a6f1c01b48 C-Z (other)
  1208   |
  1208   |
  1347   searching for changes
  1347   searching for changes
  1348   adding changesets
  1348   adding changesets
  1349   adding manifests
  1349   adding manifests
  1350   adding file changes
  1350   adding file changes
  1351   added 1 changesets with 0 changes to 0 files (+1 heads)
  1351   added 1 changesets with 0 changes to 0 files (+1 heads)
  1352   new changesets b0ee3d6f51bc
  1352   new changesets b0ee3d6f51bc (1 drafts)
  1353   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1353   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1354   $ hg -R ./client-other pull
  1354   $ hg -R ./client-other pull
  1355   pulling from ssh://user@dummy/server
  1355   pulling from ssh://user@dummy/server
  1356   searching for changes
  1356   searching for changes
  1357   adding changesets
  1357   adding changesets
  1358   adding manifests
  1358   adding manifests
  1359   adding file changes
  1359   adding file changes
  1360   added 1 changesets with 0 changes to 0 files (+1 heads)
  1360   added 1 changesets with 0 changes to 0 files (+1 heads)
  1361   new changesets b0ee3d6f51bc
  1361   new changesets b0ee3d6f51bc (1 drafts)
  1362   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1362   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1363   $ hg -R ./client-racy pull
  1363   $ hg -R ./client-racy pull
  1364   pulling from ssh://user@dummy/server
  1364   pulling from ssh://user@dummy/server
  1365   searching for changes
  1365   searching for changes
  1366   adding changesets
  1366   adding changesets
  1367   adding manifests
  1367   adding manifests
  1368   adding file changes
  1368   adding file changes
  1369   added 2 changesets with 1 changes to 1 files (+1 heads)
  1369   added 2 changesets with 1 changes to 1 files (+1 heads)
  1370   new changesets d0a85b2252a9:1b58ee3f79e5
  1370   new changesets d0a85b2252a9:1b58ee3f79e5 (2 drafts)
  1371   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1371   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1372 
  1372 
  1373   $ hg -R server graph
  1373   $ hg -R server graph
  1374   o  b0ee3d6f51bc C-Q (default)
  1374   o  b0ee3d6f51bc C-Q (default)
  1375   |
  1375   |
  1518   searching for changes
  1518   searching for changes
  1519   adding changesets
  1519   adding changesets
  1520   adding manifests
  1520   adding manifests
  1521   adding file changes
  1521   adding file changes
  1522   added 2 changesets with 2 changes to 1 files (+1 heads)
  1522   added 2 changesets with 2 changes to 1 files (+1 heads)
  1523   new changesets 2efd43f7b5ba:3d57ed3c1091
  1523   new changesets 2efd43f7b5ba:3d57ed3c1091 (2 drafts)
  1524   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1524   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1525   $ hg -R ./client-other pull
  1525   $ hg -R ./client-other pull
  1526   pulling from ssh://user@dummy/server
  1526   pulling from ssh://user@dummy/server
  1527   searching for changes
  1527   searching for changes
  1528   adding changesets
  1528   adding changesets
  1529   adding manifests
  1529   adding manifests
  1530   adding file changes
  1530   adding file changes
  1531   added 2 changesets with 2 changes to 1 files (+1 heads)
  1531   added 2 changesets with 2 changes to 1 files (+1 heads)
  1532   new changesets 2efd43f7b5ba:3d57ed3c1091
  1532   new changesets 2efd43f7b5ba:3d57ed3c1091 (2 drafts)
  1533   (run 'hg heads' to see heads, 'hg merge' to merge)
  1533   (run 'hg heads' to see heads, 'hg merge' to merge)
  1534   $ hg -R ./client-racy pull
  1534   $ hg -R ./client-racy pull
  1535   pulling from ssh://user@dummy/server
  1535   pulling from ssh://user@dummy/server
  1536   searching for changes
  1536   searching for changes
  1537   adding changesets
  1537   adding changesets
  1538   adding manifests
  1538   adding manifests
  1539   adding file changes
  1539   adding file changes
  1540   added 1 changesets with 1 changes to 1 files (+1 heads)
  1540   added 1 changesets with 1 changes to 1 files (+1 heads)
  1541   new changesets de7b9e2ba3f6
  1541   new changesets de7b9e2ba3f6 (1 drafts)
  1542   (run 'hg heads' to see heads, 'hg merge' to merge)
  1542   (run 'hg heads' to see heads, 'hg merge' to merge)
  1543 
  1543 
  1544   $ hg -R server graph
  1544   $ hg -R server graph
  1545   o  3d57ed3c1091 C-T (other)
  1545   o  3d57ed3c1091 C-T (other)
  1546   |
  1546   |
  1706   adding file changes
  1706   adding file changes
  1707   added 1 changesets with 1 changes to 1 files (+1 heads)
  1707   added 1 changesets with 1 changes to 1 files (+1 heads)
  1708   1 new obsolescence markers
  1708   1 new obsolescence markers
  1709   obsoleted 1 changesets
  1709   obsoleted 1 changesets
  1710   1 new orphan changesets
  1710   1 new orphan changesets
  1711   new changesets 720c5163ecf6
  1711   new changesets 720c5163ecf6 (1 drafts)
  1712   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1712   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1713   $ hg -R ./client-other pull
  1713   $ hg -R ./client-other pull
  1714   pulling from ssh://user@dummy/server
  1714   pulling from ssh://user@dummy/server
  1715   searching for changes
  1715   searching for changes
  1716   adding changesets
  1716   adding changesets
  1718   adding file changes
  1718   adding file changes
  1719   added 1 changesets with 1 changes to 1 files (+1 heads)
  1719   added 1 changesets with 1 changes to 1 files (+1 heads)
  1720   1 new obsolescence markers
  1720   1 new obsolescence markers
  1721   obsoleted 1 changesets
  1721   obsoleted 1 changesets
  1722   1 new orphan changesets
  1722   1 new orphan changesets
  1723   new changesets 720c5163ecf6
  1723   new changesets 720c5163ecf6 (1 drafts)
  1724   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1724   (run 'hg heads .' to see heads, 'hg merge' to merge)
  1725   $ hg -R ./client-racy pull
  1725   $ hg -R ./client-racy pull
  1726   pulling from ssh://user@dummy/server
  1726   pulling from ssh://user@dummy/server
  1727   searching for changes
  1727   searching for changes
  1728   adding changesets
  1728   adding changesets
  1729   adding manifests
  1729   adding manifests
  1730   adding file changes
  1730   adding file changes
  1731   added 1 changesets with 0 changes to 0 files
  1731   added 1 changesets with 0 changes to 0 files
  1732   1 new orphan changesets
  1732   1 new orphan changesets
  1733   new changesets a98a47d8b85b
  1733   new changesets a98a47d8b85b (1 drafts)
  1734   (run 'hg update' to get a working copy)
  1734   (run 'hg update' to get a working copy)
  1735 
  1735 
  1736   $ hg -R server debugobsolete
  1736   $ hg -R server debugobsolete
  1737   b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
  1737   b0ee3d6f51bc4c0ca6d4f2907708027a6c376233 720c5163ecf64dcc6216bee2d62bf3edb1882499 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
  1738   $ hg -R server graph
  1738   $ hg -R server graph