diff -r fcc467ca740e -r 20a3b0b27bfe tests/test-evolve.t --- a/tests/test-evolve.t Tue Jun 23 15:26:51 2015 -0700 +++ b/tests/test-evolve.t Mon Jun 22 12:44:21 2015 -0700 @@ -1239,3 +1239,61 @@ [255] $ hg fold --exact "19::" 2 changesets folded + +Check that evolve shows error while handling split commits +-------------------------------------- + + $ cat >> $HGRCPATH < [experimental] + > evolution=all + > EOF + + $ glog -r "18::" + o 31:5cc6eda0f00d@default(draft) add gg + | + | @ 30:30ecefd67c0a@default(draft) add unstableifparentisfolded + |/ + | o 20:db3d894869b0@default(draft) add gh + |/ + o 18:0bb66d4c1968@default(draft) a3 + | + +Create a split commit + $ printf "oo" > oo; + $ printf "pp" > pp; + $ hg add oo pp + $ hg commit -m "oo+pp" + $ mkcommit uu + $ hg up 30 + 0 files updated, 0 files merged, 3 files removed, 0 files unresolved + $ printf "oo" > oo; + $ hg add oo + $ hg commit -m "_oo" + created new head + $ printf "pp" > pp; + $ hg add pp + $ hg commit -m "_pp" + $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" + 1 changesets pruned + 1 new unstable changesets + $ glog -r "18::" + @ 35:072908d77206@default(draft) _pp + | + o 34:68e429987343@default(draft) _oo + | + | o 33:030868870864@default(draft) add uu + | | + | x 32:7e9688cf0a1b@default(draft) oo+pp + |/ + | o 31:5cc6eda0f00d@default(draft) add gg + | | + o | 30:30ecefd67c0a@default(draft) add unstableifparentisfolded + |/ + | o 20:db3d894869b0@default(draft) add gh + |/ + o 18:0bb66d4c1968@default(draft) a3 + | + $ hg evolve --rev "18::" + does not handle split parents yet + +