--- a/tests/test-draft.t	Sun Sep 25 12:43:00 2011 +0200
+++ b/tests/test-draft.t	Thu Sep 22 19:18:40 2011 +0200
@@ -75,6 +75,10 @@
 
 turn draft off again (repo side)
   $ hg states --off draft
+  abort: could not disable non empty state draft
+  (You may want to use `hg published 'draftheads()'`)
+  [255]
+  $ hg published tip
   $ hg log --template='{rev}:{node|short}: {state}\n'
   3:73585b17392a: published
   2:3c8695235a32: published
@@ -88,6 +92,7 @@
 
 turn draft on again (repo side)
   $ hg states draft
+  $ hg draft --exact 2
 
 test incoming and pull
 
@@ -164,6 +169,11 @@
   $ cd ..
   $ "$TESTDIR/killdaemons.py"
   $ hg -R local states --off draft
+  abort: could not disable non empty state draft
+  (You may want to use `hg published 'draftheads()'`)
+  [255]
+  $ hg -R local published tip
+  $ hg -R local states --off draft
   $ hg -R local serve -p $HGPORT -d --pid-file=local.pid
   $ cat local.pid >> "$DAEMON_PIDS"
   $ cd fromhttp2
@@ -195,11 +205,13 @@
   searching for changes
   0:5caa672bac26
   1:710fe444b3b0
+  2:3c8695235a32
+  3:73585b17392a
   $ hg push http://localhost:$HGPORT/
   pushing to http://localhost:$HGPORT/
   searching for changes
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
-  remote: added 2 changesets with 2 changes to 1 files
+  remote: added 4 changesets with 4 changes to 2 files
   $ "$TESTDIR/killdaemons.py"