Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-branches-obsolete.t
changeset 51531 f85f23f1479b
parent 51529 4141d12de073
child 51536 718f28ea3af4
equal deleted inserted replaced
51530:fc710c993ec9 51531:f85f23f1479b 
   156   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   156   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   157 #else
 
   157 #else
 
   158   $ show_cache
 
   158   $ show_cache
 
   159   ##### .hg/cache/branch3-served
 
   159   ##### .hg/cache/branch3-served
 
   160   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   160   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   161   550bb31f072912453ccbb503de1d554616911e88 o default
 
       
   162   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
       
   163 #endif
 
   161 #endif
 
   164   $ cd ..
 
   162   $ cd ..
 
   165 
   163 
   166 
   164 
   167 Actual testing
 
   165 Actual testing
 
   213   obsolete-hash=b6d2b1f5b70f09c25c835edcae69be35f681605c tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   211   obsolete-hash=b6d2b1f5b70f09c25c835edcae69be35f681605c tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   214   550bb31f072912453ccbb503de1d554616911e88 o default
 
   212   550bb31f072912453ccbb503de1d554616911e88 o default
 
   215   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   213   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   216   ##### .hg/cache/branch3-served
 
   214   ##### .hg/cache/branch3-served
 
   217   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   215   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   218   550bb31f072912453ccbb503de1d554616911e88 o default
 
       
   219   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   216   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   220 #endif
 
   217 #endif
 
   221 
   218 
   222 Even when computing branches from scratch
 
   219 Even when computing branches from scratch
 
   223 
   220 
   234   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   231   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   235 #else
 
   232 #else
 
   236   $ show_cache
 
   233   $ show_cache
 
   237   ##### .hg/cache/branch3-served
 
   234   ##### .hg/cache/branch3-served
 
   238   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   235   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   239   550bb31f072912453ccbb503de1d554616911e88 o default
 
       
   240   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   236   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   241 #endif
 
   237 #endif
 
   242 
   238 
   243 And we can get back to normal
 
   239 And we can get back to normal
 
   244 
   240 
   254   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   250   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   255 #else
 
   251 #else
 
   256   $ show_cache
 
   252   $ show_cache
 
   257   ##### .hg/cache/branch3-served
 
   253   ##### .hg/cache/branch3-served
 
   258   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   254   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   259   550bb31f072912453ccbb503de1d554616911e88 o default
 
       
   260   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
       
   261 #endif
 
   255 #endif
 
   262 
   256 
   263   $ cd ..
 
   257   $ cd ..
 
   264   $ rm -rf tmp-repo
 
   258   $ rm -rf tmp-repo
 
   265 
   259 
   308   550bb31f072912453ccbb503de1d554616911e88 o default
 
   302   550bb31f072912453ccbb503de1d554616911e88 o default
 
   309   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   303   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   310   ##### .hg/cache/branch3-served
 
   304   ##### .hg/cache/branch3-served
 
   311   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   305   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   312   550bb31f072912453ccbb503de1d554616911e88 o default
 
   306   550bb31f072912453ccbb503de1d554616911e88 o default
 
   313   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
       
   314 #endif
 
   307 #endif
 
   315 
   308 
   316 Even when computing branches from scratch
 
   309 Even when computing branches from scratch
 
   317 
   310 
   318   $ rm -rf .hg/cache/branch*
 
   311   $ rm -rf .hg/cache/branch*
 
   329 #else
 
   322 #else
 
   330   $ show_cache
 
   323   $ show_cache
 
   331   ##### .hg/cache/branch3-served
 
   324   ##### .hg/cache/branch3-served
 
   332   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   325   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   333   550bb31f072912453ccbb503de1d554616911e88 o default
 
   326   550bb31f072912453ccbb503de1d554616911e88 o default
 
   334   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
       
   335 #endif
 
   327 #endif
 
   336 
   328 
   337 And we can get back to normal
 
   329 And we can get back to normal
 
   338 
   330 
   339   $ hg update null --quiet
 
   331   $ hg update null --quiet
 
   348   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   340   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   349 #else
 
   341 #else
 
   350   $ show_cache
 
   342   $ show_cache
 
   351   ##### .hg/cache/branch3-served
 
   343   ##### .hg/cache/branch3-served
 
   352   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   344   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   353   550bb31f072912453ccbb503de1d554616911e88 o default
 
       
   354   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
       
   355 #endif
 
   345 #endif
 
   356 
   346 
   357   $ cd ..
 
   347   $ cd ..
 
   358   $ rm -rf tmp-repo
 
   348   $ rm -rf tmp-repo
 
   359 
   349 
   404   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   394   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   405 #else
 
   395 #else
 
   406   $ show_cache
 
   396   $ show_cache
 
   407   ##### .hg/cache/branch3-served
 
   397   ##### .hg/cache/branch3-served
 
   408   obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   398   obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   409   63ba7cd843d1e95aac1a24435befeb1909c53619 o default
 
       
   410   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   399   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   411 #endif
 
   400 #endif
 
   412 
   401 
   413 Even when computing branches from scratch
 
   402 Even when computing branches from scratch
 
   414 
   403 
   425   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   414   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   426 #else
 
   415 #else
 
   427   $ show_cache
 
   416   $ show_cache
 
   428   ##### .hg/cache/branch3-served
 
   417   ##### .hg/cache/branch3-served
 
   429   obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   418   obsolete-hash=ac5282439f301518f362f37547fcd52bcc670373 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   430   63ba7cd843d1e95aac1a24435befeb1909c53619 o default
 
       
   431   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   419   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   432 #endif
 
   420 #endif
 
   433 
   421 
   434 And we can get back to normal
 
   422 And we can get back to normal
 
   435 
   423 
   445   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   433   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
   446 #else
 
   434 #else
 
   447   $ show_cache
 
   435   $ show_cache
 
   448   ##### .hg/cache/branch3-served
 
   436   ##### .hg/cache/branch3-served
 
   449   tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   437   tip-node=7c29ff2453bf38c75ee8982935739103c38a9284 tip-rev=7
 
   450   63ba7cd843d1e95aac1a24435befeb1909c53619 o default
 
       
   451   7c29ff2453bf38c75ee8982935739103c38a9284 o default
 
       
   452 #endif
 
   438 #endif
 
   453 
   439 
   454   $ cd ..
 
   440   $ cd ..
 
   455   $ rm -rf tmp-repo
 
   441   $ rm -rf tmp-repo
 
   456 
   442 
   490   3d808bbc94408ea19da905596d4079357a1f28be o default
 
   476   3d808bbc94408ea19da905596d4079357a1f28be o default
 
   491 #else
 
   477 #else
 
   492   $ show_cache
 
   478   $ show_cache
 
   493   ##### .hg/cache/branch3-served
 
   479   ##### .hg/cache/branch3-served
 
   494   tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   480   tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   495   63ba7cd843d1e95aac1a24435befeb1909c53619 o default
 
       
   496   3d808bbc94408ea19da905596d4079357a1f28be o default
 
       
   497 #endif
 
   481 #endif
 
   498 
   482 
   499   $ hg pull --rev `cat ../main-single-branch-node_B4` --remote-hidden
 
   483   $ hg pull --rev `cat ../main-single-branch-node_B4` --remote-hidden
 
   500   pulling from $TESTTMP/main-single-branch
 
   484   pulling from $TESTTMP/main-single-branch
 
   501   no changes found
 
   485   no changes found
 
   516 #else
 
   500 #else
 
   517   $ show_cache
 
   501   $ show_cache
 
   518   ##### .hg/cache/branch3-served
 
   502   ##### .hg/cache/branch3-served
 
   519   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   503   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   520   550bb31f072912453ccbb503de1d554616911e88 o default
 
   504   550bb31f072912453ccbb503de1d554616911e88 o default
 
   521   3d808bbc94408ea19da905596d4079357a1f28be o default
 
       
   522 #endif
 
   505 #endif
 
   523 
   506 
   524 Even when computing branches from scratch
 
   507 Even when computing branches from scratch
 
   525 
   508 
   526   $ rm -rf .hg/cache/branch*
 
   509   $ rm -rf .hg/cache/branch*
 
   537 #else
 
   520 #else
 
   538   $ show_cache
 
   521   $ show_cache
 
   539   ##### .hg/cache/branch3-served
 
   522   ##### .hg/cache/branch3-served
 
   540   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   523   filtered-hash=f1456c0d675980582dda9b8edc7f13f503ce544f obsolete-hash=3e74f5349008671629e39d13d7e00d9ba94c74f7 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   541   550bb31f072912453ccbb503de1d554616911e88 o default
 
   524   550bb31f072912453ccbb503de1d554616911e88 o default
 
       
   525 #endif
 
       
   526 
       
   527 And we can get back to normal
 
       
   528 
       
   529   $ hg update null --quiet
 
       
   530   $ hg heads -T '{desc}\n'
 
       
   531   A_4
 
       
   532   B_1
 
       
   533 #if v2
 
       
   534   $ show_cache
 
       
   535   ##### .hg/cache/branch2-served
 
       
   536   3d808bbc94408ea19da905596d4079357a1f28be 8 f8006d64a10d35c011a5c5fa88be1e25c5929514
 
       
   537   550bb31f072912453ccbb503de1d554616911e88 o default
 
   542   3d808bbc94408ea19da905596d4079357a1f28be o default
 
   538   3d808bbc94408ea19da905596d4079357a1f28be o default
 
   543 #endif
 
       
   544 
       
   545 And we can get back to normal
 
       
   546 
       
   547   $ hg update null --quiet
 
       
   548   $ hg heads -T '{desc}\n'
 
       
   549   A_4
 
       
   550   B_1
 
       
   551 #if v2
 
       
   552   $ show_cache
 
       
   553   ##### .hg/cache/branch2-served
 
       
   554   3d808bbc94408ea19da905596d4079357a1f28be 8 f8006d64a10d35c011a5c5fa88be1e25c5929514
 
       
   555   550bb31f072912453ccbb503de1d554616911e88 o default
 
       
   556   3d808bbc94408ea19da905596d4079357a1f28be o default
 
       
   557 #else
 
   539 #else
 
   558   $ show_cache
 
   540   $ show_cache
 
   559   ##### .hg/cache/branch3-served
 
   541   ##### .hg/cache/branch3-served
 
   560   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   542   filtered-hash=f8006d64a10d35c011a5c5fa88be1e25c5929514 tip-node=3d808bbc94408ea19da905596d4079357a1f28be tip-rev=8
 
   561   550bb31f072912453ccbb503de1d554616911e88 o default
 
       
   562   3d808bbc94408ea19da905596d4079357a1f28be o default
 
       
   563 #endif
 
   543 #endif
 
   564 
   544 
   565   $ cd ..
 
   545   $ cd ..
 
   566   $ rm -rf tmp-repo
 
   546   $ rm -rf tmp-repo
mercurial