tests/test-prune.t
branchstable
changeset 4701 1b5da965d72a
parent 4699 dfd88e3fa90a
child 4702 fcecbb1261f2
equal deleted inserted replaced
4699:dfd88e3fa90a 4701:1b5da965d72a
   457      B                         8:d62d843c9a01
   457      B                         8:d62d843c9a01
   458    * CELESTE                   8:d62d843c9a01
   458    * CELESTE                   8:d62d843c9a01
   459      r10                       8:d62d843c9a01
   459      r10                       8:d62d843c9a01
   460      rg                        15:cd0038e05e1b
   460      rg                        15:cd0038e05e1b
   461 
   461 
       
   462   $ cd ..
       
   463 
       
   464 Test that prune doesn't update off when pruning unrelated commit (issue6137)
       
   465 ----------------------------------------------------------------------------
       
   466 
       
   467   $ hg init issue6137
       
   468   $ cd issue6137
       
   469   $ echo a > a
       
   470   $ hg ci -Aqm "added a"
       
   471   $ echo b > b
       
   472   $ hg ci -Aqm "added b"
       
   473 
       
   474   $ hg prune .
       
   475   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   476   working directory is now at 9092f1db7931
       
   477   1 changesets pruned
       
   478 
       
   479   $ echo c > c
       
   480   $ hg ci -Aqm "added c"
       
   481 
       
   482 update to obsoleted revision and perform prune on unrelated revision:
       
   483   $ hg up -r "desc('added b')" --hidden -q
       
   484   updated to hidden changeset 5f6d8a4bf34a
       
   485   (hidden revision '5f6d8a4bf34a' is pruned)
       
   486   working directory parent is obsolete! (5f6d8a4bf34a)
       
   487 
       
   488   $ hg log -G
       
   489   o  2:29edef26570b[] (draft) added c
       
   490   |
       
   491   | @  1:5f6d8a4bf34a[] (obsolete/draft) added b
       
   492   |/
       
   493   o  0:9092f1db7931[] (draft) added a
       
   494   
       
   495   $ hg prune -r "desc('added c')"
       
   496   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   497   working directory is now at 9092f1db7931
       
   498   1 changesets pruned
       
   499 
       
   500   $ hg par
       
   501   0:9092f1db7931[] (draft) added a
       
   502 XXX: it doesn't make sense to update to "added a"; parent should be "added b"
       
   503 
       
   504   $ cd ..