diff tests/test-rebase-mq-skip @ 11843:00f8e7837668 stable

rebase: recompute the set of skipped rev when using --continue (issue2330)

--- a/tests/test-rebase-mq-skip	Sun Jul 25 08:22:03 2010 -0700
+++ b/tests/test-rebase-mq-skip	Fri Aug 13 18:02:02 2010 +0200
@@ -44,3 +44,33 @@
 hg up -C qtip
 hg rebase | hidebackup
 hg glog  --template '{rev} {desc} tags: {tags}\n'
+
+echo
+echo '% Now with --continue'
+cd ..
+hg init b
+cd b
+hg qinit -c # This must work even with a managed mq queue
+
+for i in r0 r1 r2 r3 r4 r5 r6;
+do
+	echo $i > $i
+	hg ci -Am $i
+done
+hg qimport -r 1:tip
+hg up 0
+for i in r1 r3 r7 r8;
+do
+	echo $i > $i
+	hg ci -Am branch2-$i
+done
+echo somethingelse > r4
+hg ci -Am branch2-r4
+echo r6 > r6
+hg ci -Am branch2-r6
+
+hg up qtip
+HGMERGE=internal:fail hg rebase | hidebackup
+HGMERGE=internal:local hg resolve --all
+hg rebase --continue | hidebackup
+hg glog  --template '{rev} {desc} tags: {tags}\n'