tests/test-stablesort-branchpoint.t
branchmercurial-4.3
changeset 3287 4303a46b4167
parent 3257 064738ae1588
equal deleted inserted replaced
3286:76c447d88d9a 3287:4303a46b4167
   160   $ hg clone repo_A repo_B --rev 5
   160   $ hg clone repo_A repo_B --rev 5
   161   adding changesets
   161   adding changesets
   162   adding manifests
   162   adding manifests
   163   adding file changes
   163   adding file changes
   164   added 4 changesets with 0 changes to 0 files
   164   added 4 changesets with 0 changes to 0 files
   165   new changesets 1ea73414a91b:f0f3ef9a6cd5
       
   166   updating to branch default
   165   updating to branch default
   167   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   166   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   168   $ hg -R repo_B pull --rev 13
   167   $ hg -R repo_B pull --rev 13
   169   pulling from $TESTTMP/repo_A (glob)
   168   pulling from $TESTTMP/repo_A (glob)
   170   searching for changes
   169   searching for changes
   171   adding changesets
   170   adding changesets
   172   adding manifests
   171   adding manifests
   173   adding file changes
   172   adding file changes
   174   added 4 changesets with 0 changes to 0 files (+1 heads)
   173   added 4 changesets with 0 changes to 0 files (+1 heads)
   175   new changesets 66f7d451a68b:b4594d867745
       
   176   (run 'hg heads' to see heads, 'hg merge' to merge)
   174   (run 'hg heads' to see heads, 'hg merge' to merge)
   177   $ hg -R repo_B pull --rev 14
   175   $ hg -R repo_B pull --rev 14
   178   pulling from $TESTTMP/repo_A (glob)
   176   pulling from $TESTTMP/repo_A (glob)
   179   searching for changes
   177   searching for changes
   180   adding changesets
   178   adding changesets
   181   adding manifests
   179   adding manifests
   182   adding file changes
   180   adding file changes
   183   added 1 changesets with 0 changes to 0 files (+1 heads)
   181   added 1 changesets with 0 changes to 0 files (+1 heads)
   184   new changesets 43227190fef8
       
   185   (run 'hg heads .' to see heads, 'hg merge' to merge)
   182   (run 'hg heads .' to see heads, 'hg merge' to merge)
   186   $ hg -R repo_B pull
   183   $ hg -R repo_B pull
   187   pulling from $TESTTMP/repo_A (glob)
   184   pulling from $TESTTMP/repo_A (glob)
   188   searching for changes
   185   searching for changes
   189   adding changesets
   186   adding changesets
   190   adding manifests
   187   adding manifests
   191   adding file changes
   188   adding file changes
   192   added 7 changesets with 0 changes to 0 files (+3 heads)
   189   added 7 changesets with 0 changes to 0 files (+3 heads)
   193   new changesets 2702dd0c91e7:1d8d22637c2d
       
   194   (run 'hg heads .' to see heads, 'hg merge' to merge)
   190   (run 'hg heads .' to see heads, 'hg merge' to merge)
   195   $ hg -R repo_B log -G
   191   $ hg -R repo_B log -G
   196   o    15 1d8d22637c2d r15 tip
   192   o    15 1d8d22637c2d r15 tip
   197   |\
   193   |\
   198   | | o  14 e46a4836065c r12
   194   | | o  14 e46a4836065c r12
   247   $ hg clone repo_A repo_C --rev 10
   243   $ hg clone repo_A repo_C --rev 10
   248   adding changesets
   244   adding changesets
   249   adding manifests
   245   adding manifests
   250   adding file changes
   246   adding file changes
   251   added 7 changesets with 0 changes to 0 files
   247   added 7 changesets with 0 changes to 0 files
   252   new changesets 1ea73414a91b:ff43616e5d0f
       
   253   updating to branch default
   248   updating to branch default
   254   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   249   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   255   $ hg -R repo_C pull --rev 12
   250   $ hg -R repo_C pull --rev 12
   256   pulling from $TESTTMP/repo_A (glob)
   251   pulling from $TESTTMP/repo_A (glob)
   257   searching for changes
   252   searching for changes
   258   adding changesets
   253   adding changesets
   259   adding manifests
   254   adding manifests
   260   adding file changes
   255   adding file changes
   261   added 2 changesets with 0 changes to 0 files (+1 heads)
   256   added 2 changesets with 0 changes to 0 files (+1 heads)
   262   new changesets bab5d5bf48bd:e46a4836065c
       
   263   (run 'hg heads' to see heads, 'hg merge' to merge)
   257   (run 'hg heads' to see heads, 'hg merge' to merge)
   264   $ hg -R repo_C pull --rev 15
   258   $ hg -R repo_C pull --rev 15
   265   pulling from $TESTTMP/repo_A (glob)
   259   pulling from $TESTTMP/repo_A (glob)
   266   searching for changes
   260   searching for changes
   267   adding changesets
   261   adding changesets
   268   adding manifests
   262   adding manifests
   269   adding file changes
   263   adding file changes
   270   added 4 changesets with 0 changes to 0 files (+1 heads)
   264   added 4 changesets with 0 changes to 0 files (+1 heads)
   271   new changesets 4c748ffd1a46:1d8d22637c2d
       
   272   (run 'hg heads .' to see heads, 'hg merge' to merge)
   265   (run 'hg heads .' to see heads, 'hg merge' to merge)
   273   $ hg -R repo_C pull
   266   $ hg -R repo_C pull
   274   pulling from $TESTTMP/repo_A (glob)
   267   pulling from $TESTTMP/repo_A (glob)
   275   searching for changes
   268   searching for changes
   276   adding changesets
   269   adding changesets
   277   adding manifests
   270   adding manifests
   278   adding file changes
   271   adding file changes
   279   added 3 changesets with 0 changes to 0 files (+3 heads)
   272   added 3 changesets with 0 changes to 0 files (+3 heads)
   280   new changesets 2702dd0c91e7:b4594d867745
       
   281   (run 'hg heads .' to see heads, 'hg merge' to merge)
   273   (run 'hg heads .' to see heads, 'hg merge' to merge)
   282   $ hg -R repo_C log -G
   274   $ hg -R repo_C log -G
   283   o  15 b4594d867745 r13 tip
   275   o  15 b4594d867745 r13 tip
   284   |
   276   |
   285   | o  14 dcbb326fdec2 r9
   277   | o  14 dcbb326fdec2 r9
   317   $ hg clone repo_A repo_D --rev 2
   309   $ hg clone repo_A repo_D --rev 2
   318   adding changesets
   310   adding changesets
   319   adding manifests
   311   adding manifests
   320   adding file changes
   312   adding file changes
   321   added 2 changesets with 0 changes to 0 files
   313   added 2 changesets with 0 changes to 0 files
   322   new changesets 1ea73414a91b:fa942426a6fd
       
   323   updating to branch default
   314   updating to branch default
   324   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   315   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   325   $ hg -R repo_D pull --rev 10
   316   $ hg -R repo_D pull --rev 10
   326   pulling from $TESTTMP/repo_A (glob)
   317   pulling from $TESTTMP/repo_A (glob)
   327   searching for changes
   318   searching for changes
   328   adding changesets
   319   adding changesets
   329   adding manifests
   320   adding manifests
   330   adding file changes
   321   adding file changes
   331   added 5 changesets with 0 changes to 0 files
   322   added 5 changesets with 0 changes to 0 files
   332   new changesets 66f7d451a68b:ff43616e5d0f
       
   333   (run 'hg update' to get a working copy)
   323   (run 'hg update' to get a working copy)
   334   $ hg -R repo_D pull --rev 15
   324   $ hg -R repo_D pull --rev 15
   335   pulling from $TESTTMP/repo_A (glob)
   325   pulling from $TESTTMP/repo_A (glob)
   336   searching for changes
   326   searching for changes
   337   adding changesets
   327   adding changesets
   338   adding manifests
   328   adding manifests
   339   adding file changes
   329   adding file changes
   340   added 4 changesets with 0 changes to 0 files (+1 heads)
   330   added 4 changesets with 0 changes to 0 files (+1 heads)
   341   new changesets 4c748ffd1a46:1d8d22637c2d
       
   342   (run 'hg heads' to see heads, 'hg merge' to merge)
   331   (run 'hg heads' to see heads, 'hg merge' to merge)
   343   $ hg -R repo_D pull
   332   $ hg -R repo_D pull
   344   pulling from $TESTTMP/repo_A (glob)
   333   pulling from $TESTTMP/repo_A (glob)
   345   searching for changes
   334   searching for changes
   346   adding changesets
   335   adding changesets
   347   adding manifests
   336   adding manifests
   348   adding file changes
   337   adding file changes
   349   added 5 changesets with 0 changes to 0 files (+4 heads)
   338   added 5 changesets with 0 changes to 0 files (+4 heads)
   350   new changesets 2702dd0c91e7:b4594d867745
       
   351   (run 'hg heads .' to see heads, 'hg merge' to merge)
   339   (run 'hg heads .' to see heads, 'hg merge' to merge)
   352   $ hg -R repo_D log -G
   340   $ hg -R repo_D log -G
   353   o  15 b4594d867745 r13 tip
   341   o  15 b4594d867745 r13 tip
   354   |
   342   |
   355   | o  14 e46a4836065c r12
   343   | o  14 e46a4836065c r12
   455   $ hg clone repo_A repo_E --rev "43227190fef8"
   443   $ hg clone repo_A repo_E --rev "43227190fef8"
   456   adding changesets
   444   adding changesets
   457   adding manifests
   445   adding manifests
   458   adding file changes
   446   adding file changes
   459   added 5 changesets with 0 changes to 0 files
   447   added 5 changesets with 0 changes to 0 files
   460   new changesets 1ea73414a91b:43227190fef8
       
   461   updating to branch default
   448   updating to branch default
   462   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   449   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   463   $ hg -R repo_E pull --rev e7d9710d9fc6
   450   $ hg -R repo_E pull --rev e7d9710d9fc6
   464   pulling from $TESTTMP/repo_A (glob)
   451   pulling from $TESTTMP/repo_A (glob)
   465   searching for changes
   452   searching for changes
   466   adding changesets
   453   adding changesets
   467   adding manifests
   454   adding manifests
   468   adding file changes
   455   adding file changes
   469   added 1 changesets with 0 changes to 0 files (+1 heads)
   456   added 1 changesets with 0 changes to 0 files (+1 heads)
   470   new changesets e7d9710d9fc6
       
   471   (run 'hg heads' to see heads, 'hg merge' to merge)
   457   (run 'hg heads' to see heads, 'hg merge' to merge)
   472 
   458 
   473   $ hg clone repo_A repo_F --rev "1d8d22637c2d"
   459   $ hg clone repo_A repo_F --rev "1d8d22637c2d"
   474   adding changesets
   460   adding changesets
   475   adding manifests
   461   adding manifests
   476   adding file changes
   462   adding file changes
   477   added 8 changesets with 0 changes to 0 files
   463   added 8 changesets with 0 changes to 0 files
   478   new changesets 1ea73414a91b:1d8d22637c2d
       
   479   updating to branch default
   464   updating to branch default
   480   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   465   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   481   $ hg -R repo_F pull --rev d62d843c9a01
   466   $ hg -R repo_F pull --rev d62d843c9a01
   482   pulling from $TESTTMP/repo_A (glob)
   467   pulling from $TESTTMP/repo_A (glob)
   483   searching for changes
   468   searching for changes
   484   adding changesets
   469   adding changesets
   485   adding manifests
   470   adding manifests
   486   adding file changes
   471   adding file changes
   487   added 2 changesets with 0 changes to 0 files (+1 heads)
   472   added 2 changesets with 0 changes to 0 files (+1 heads)
   488   new changesets e7d9710d9fc6:d62d843c9a01
       
   489   (run 'hg heads' to see heads, 'hg merge' to merge)
   473   (run 'hg heads' to see heads, 'hg merge' to merge)
   490 
   474 
   491   $ hg clone repo_A repo_G --rev "e7d9710d9fc6"
   475   $ hg clone repo_A repo_G --rev "e7d9710d9fc6"
   492   adding changesets
   476   adding changesets
   493   adding manifests
   477   adding manifests
   494   adding file changes
   478   adding file changes
   495   added 5 changesets with 0 changes to 0 files
   479   added 5 changesets with 0 changes to 0 files
   496   new changesets 1ea73414a91b:e7d9710d9fc6
       
   497   updating to branch default
   480   updating to branch default
   498   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   481   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   499   $ hg -R repo_G pull --rev 43227190fef8
   482   $ hg -R repo_G pull --rev 43227190fef8
   500   pulling from $TESTTMP/repo_A (glob)
   483   pulling from $TESTTMP/repo_A (glob)
   501   searching for changes
   484   searching for changes
   502   adding changesets
   485   adding changesets
   503   adding manifests
   486   adding manifests
   504   adding file changes
   487   adding file changes
   505   added 1 changesets with 0 changes to 0 files (+1 heads)
   488   added 1 changesets with 0 changes to 0 files (+1 heads)
   506   new changesets 43227190fef8
       
   507   (run 'hg heads' to see heads, 'hg merge' to merge)
   489   (run 'hg heads' to see heads, 'hg merge' to merge)
   508   $ hg -R repo_G pull --rev 2702dd0c91e7
   490   $ hg -R repo_G pull --rev 2702dd0c91e7
   509   pulling from $TESTTMP/repo_A (glob)
   491   pulling from $TESTTMP/repo_A (glob)
   510   searching for changes
   492   searching for changes
   511   adding changesets
   493   adding changesets
   512   adding manifests
   494   adding manifests
   513   adding file changes
   495   adding file changes
   514   added 3 changesets with 0 changes to 0 files (+1 heads)
   496   added 3 changesets with 0 changes to 0 files (+1 heads)
   515   new changesets 4c748ffd1a46:2702dd0c91e7
       
   516   (run 'hg heads .' to see heads, 'hg merge' to merge)
   497   (run 'hg heads .' to see heads, 'hg merge' to merge)
   517 
   498 
   518   $ for x in E F G; do
   499   $ for x in E F G; do
   519   >     hg -R repo_$x showsort --rev 'e7d9710d9fc6+43227190fef8' > ${x}.non-heads.order;
   500   >     hg -R repo_$x showsort --rev 'e7d9710d9fc6+43227190fef8' > ${x}.non-heads.order;
   520   > done
   501   > done
   661   $ hg clone recursion_A recursion_random --rev 0
   642   $ hg clone recursion_A recursion_random --rev 0
   662   adding changesets
   643   adding changesets
   663   adding manifests
   644   adding manifests
   664   adding file changes
   645   adding file changes
   665   added 1 changesets with 0 changes to 0 files
   646   added 1 changesets with 0 changes to 0 files
   666   new changesets 1ea73414a91b
       
   667   updating to branch default
   647   updating to branch default
   668   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   648   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   669   $ cd recursion_random
   649   $ cd recursion_random
   670   $ for x in `python ../random_rev.py 15 5`; do
   650   $ for x in `python ../random_rev.py 15 5`; do
   671   >   # using python to benefit from the random seed
   651   >   # using python to benefit from the random seed