tests/test-evolve-order.t
changeset 1408 b3afdc0815d0
parent 1370 0799c5831a3d
child 1412 8794a4680bdd
--- a/tests/test-evolve-order.t	Fri Jun 19 14:18:45 2015 -0700
+++ b/tests/test-evolve-order.t	Tue Jun 16 17:56:23 2015 -0700
@@ -233,5 +233,30 @@
   o  15:225d2cc5d3fc@default(draft) add _d
   |
 
+Test multiple revision with some un-evolvable because parent is splitted
+------------------------------------------------------------------------
 
+  $ hg up 'desc(c2prime)'
+  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  $ mkcommit c3part1
+  created new head
+  $ hg prev
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  [29] add c2prime
+  $ mkcommit c3part2
+  created new head
+  $ hg prune -s 'desc(c3part1)' 'desc(c3_)'
+  1 changesets pruned
+  1 new unstable changesets
+  $ hg prune -s 'desc(c3part2)' 'desc(c3_)'
+  1 changesets pruned
+  2 new divergent changesets
+  $ hg up 'desc(b3prime)'
+  2 files updated, 0 files merged, 3 files removed, 0 files unresolved
+  $ hg amend -m 'b3second'
+  1 new unstable changesets
+  $ hg evolve --rev 'unstable()'
+  move:[30] add b4_
+  atop:[35] b3second
+  working directory is now at a51a8a82fdba