tests/test-published.t
changeset 64 6a7dc5ca05b8
parent 63 f47a5f990eb2
child 65 7c8f992d567e
--- a/tests/test-published.t	Mon Sep 12 23:47:06 2011 +0200
+++ b/tests/test-published.t	Tue Sep 13 00:45:42 2011 +0200
@@ -5,11 +5,12 @@
   > allow_push = *
   > [extensions]
   > hgext.rebase=
+  > hgext.mq=
   > EOF
   $ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH
 
 
-test you can't rebase published changeset
+init stuff
 
   $ hg init local
   $ cd local
@@ -26,21 +27,33 @@
   $ hg add rhino
   $ hg ci -m "add rhino"
   created new head
+  $ hg published 1 2
   $ hg up 1 -q
-  $ hg rebase
+  $ hg states draft
+  $ echo "flore" > babar
+  $ hg ci -m "add daughter"
+
+test you can't qimport published changeset
+
+  $ hg qimport -r 1
+  abort: can not qimport published changeset 710fe444b3b0
+  (see `hg help --extension states` for details)
+  [255]
+
+but other are ok
+
+  $ hg qimport -r 3
+  $ hg qfinish -a
+
+test you can't rebase published changeset
+
+  $ hg rebase --dest 2 -b 1
   abort: can not rebase published changeset 710fe444b3b0
   (see `hg help --extension states` for details)
   [255]
 
 test you still can rebase other one
 
-  $ hg published 1 2
-  $ hg states draft
-  $ echo "flore" > babar
-  $ hg ci -m "add daughter"
-  $ hg rebase --dest 2
-  abort: can not rebase published changeset 710fe444b3b0
-  (see `hg help --extension states` for details)
-  [255]
   $ hg rebase --dest 2 -s 3
   saved backup bundle to $TESTTMP/local/.hg/strip-backup/b7f6698b7ad7-backup.hg
+