tests/test-evolve-order.t
changeset 1408 b3afdc0815d0
parent 1370 0799c5831a3d
child 1412 8794a4680bdd
equal deleted inserted replaced
1407:552687eb4856 1408:b3afdc0815d0
   231   o |  22:a329855d0bc1@default(draft) add c1second
   231   o |  22:a329855d0bc1@default(draft) add c1second
   232   |/
   232   |/
   233   o  15:225d2cc5d3fc@default(draft) add _d
   233   o  15:225d2cc5d3fc@default(draft) add _d
   234   |
   234   |
   235 
   235 
   236 
   236 Test multiple revision with some un-evolvable because parent is splitted
   237 
   237 ------------------------------------------------------------------------
       
   238 
       
   239   $ hg up 'desc(c2prime)'
       
   240   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
       
   241   $ mkcommit c3part1
       
   242   created new head
       
   243   $ hg prev
       
   244   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   245   [29] add c2prime
       
   246   $ mkcommit c3part2
       
   247   created new head
       
   248   $ hg prune -s 'desc(c3part1)' 'desc(c3_)'
       
   249   1 changesets pruned
       
   250   1 new unstable changesets
       
   251   $ hg prune -s 'desc(c3part2)' 'desc(c3_)'
       
   252   1 changesets pruned
       
   253   2 new divergent changesets
       
   254   $ hg up 'desc(b3prime)'
       
   255   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
       
   256   $ hg amend -m 'b3second'
       
   257   1 new unstable changesets
       
   258   $ hg evolve --rev 'unstable()'
       
   259   move:[30] add b4_
       
   260   atop:[35] b3second
       
   261   working directory is now at a51a8a82fdba
       
   262