# HG changeset patch # User Pierre-Yves David # Date 1340761069 -7200 # Node ID c099ed0dd472df51e144fc227adbc74d24e013b1 # Parent 3db377533c32b2529a705a4680b3dff3c57e8ec1 evolve: improve kill testing show than uncommited changes are properly merged diff -r 3db377533c32 -r c099ed0dd472 tests/test-evolve.t --- a/tests/test-evolve.t Tue Jun 26 18:23:30 2012 +0200 +++ b/tests/test-evolve.t Wed Jun 27 03:37:49 2012 +0200 @@ -56,7 +56,9 @@ test simple kill - $ hg kill 5 + $ hg id -n + 5 + $ hg kill . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at fbb94e3a0ecf $ hg qlog @@ -75,6 +77,18 @@ 2 - 4538525df7e2 add c (draft) 1 - 7c3bad9141dc add b (public) 0 - 1f0dee641bb7 add a (public) + +test kill with dirty changes + + $ hg up 2 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ echo 4 > g + $ hg add g + $ hg kill . + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + working directory now at 7c3bad9141dc + $ hg st + A g $ cd .. ##########################