# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1240387199 -7200
# Node ID aacff0cf538c502a6763101009b92ca52fafe1da
# Parent  3c065c600270f67c19d8fed17076dff602189f72
test-rebase: add two more test cases to test mq-skip. The 2nd fails.

diff --git a/tests/test-rebase-mq-skip b/tests/test-rebase-mq-skip
--- a/tests/test-rebase-mq-skip
+++ b/tests/test-rebase-mq-skip
@@ -38,7 +38,40 @@
 rm p1.patch
 
 echo
+echo 'c2' > c2
+hg add c2
+hg commit -d '1 0' -u test -m "C2"
+
+echo
 echo '% Rebase'
 hg up -C qtip
 hg rebase  2>&1 | sed -e 's/\(saving bundle to \).*/\1/'
 hg glog  --template '{rev} {desc} tags: {tags}\n'
+
+hg qpop -a
+echo
+echo '% new repo, same as other before import'
+hg clone . ../b -r 2
+cd ../b
+hg qimport -r 2 -n p1_new.patch
+hg qpop
+hg qimport ../a/.hg/patches/p0.patch
+hg qpush -a
+
+echo
+echo '% pull --rebase'
+hg pull --rebase ../a 2>&1 | sed -e 's/\(saving bundle to \).*/\1/'
+hg glog  --template '{rev} {desc} tags: {tags}\n'
+
+echo
+echo '% new repo, pulld revision will be on the same place as in the mq'
+hg clone ../a ../c -r 2
+cd ../c
+hg qimport -r 2 -n p1_new.patch
+hg qimport ../a/.hg/patches/p0.patch
+hg qpush -a
+
+echo
+echo '% pull --rebase'
+hg pull --rebase ../a 2>&1 | sed -e 's/\(saving bundle to \).*/\1/'
+hg glog  --template '{rev} {desc} tags: {tags}\n'