Mercurial > evolve

diff tests/test-tutorial.t @ 466:b98490b689a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stabilize: handle killed changeset in stabilize.
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Mon, 20 Aug 2012 14:40:48 +0200
parents d702f0d26c6a
children 2111c655b4f5
line wrap: on
line diff
--- a/tests/test-tutorial.t	Mon Aug 20 14:13:29 2012 +0200
+++ b/tests/test-tutorial.t	Mon Aug 20 14:40:48 2012 +0200
@@ -741,16 +741,13 @@
   $ hg log -r 'unstable()'
   ae45c0c3092a (draft): SPAM SPAM SPAM
 
-# XXX make prune stabilization works
-#  $ hg stabilize --any
-#  merging shopping
-
-  $ hg graft -O ae45c0c3092a
-  grafting revision 17
+  $ hg stabilize --any
+  move:[17] SPAM SPAM SPAM
+  atop:[14] bathroom stuff
   merging shopping
 
   $ hg log -G
-  @  20de1fb1cec5 (draft): SPAM SPAM SPAM
+  @  d6717f710962 (draft): SPAM SPAM SPAM
   |
   o  ffa278c50818 (draft): bathroom stuff
   |