X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-splitbrains;h=9f0ae5ff917fca0c7cf69c4931b796f93e2e9042;hb=a47f1af332372a372bf5758d1e3d9eeffe14acbd;hp=2478465a182818f9d90c7c22b30b4235a1e86198;hpb=d2fa05117e4f4a91db3dd0c383eaffb4ffe1b080;p=dgit.git

diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index 2478465a..9f0ae5ff 100755
--- a/tests/tests/quilt-splitbrains
+++ b/tests/tests/quilt-splitbrains
@@ -2,6 +2,14 @@
 set -e
 . tests/lib
 
+suitespecs+=' stable'
+
+# This test script tests each of the split brain quilt modes, and
+# --quilt=linear, with a tree suitable for each of those, and pushes
+# them in sequence.  The idea is to check that each tree is rejected
+# by the wrong quilt modes, and accepted and processed correctly by
+# the right ones.
+
 t-tstunt-parsechangelog
 
 t-newtag
@@ -15,11 +23,12 @@ suite=sid
 
 want-success () {
 	local qmode=$1; shift
-	t-dgit "$@" --quilt=$qmode build-source
-
 	t-refs-same-start
 	t-ref-head
-	t-dgit "$@" --quilt=$qmode push
+
+	t-dgit "$@" --quilt=$qmode --dgit-view-save=split.b build-source
+
+	t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push
 	t-$qmode-pushed-good
 }
 
@@ -52,7 +61,7 @@ Subject: Add .gitignore
 ---
 END
 
-git-diff /dev/null .gitignore >>$pf || test $? = 1
+git diff /dev/null .gitignore >>$pf || test $? = 1
 echo ${pf##*/} >>debian/patches/series
 
 git add debian/patches
@@ -123,5 +132,9 @@ t-dgit -wgf build-source
 
 want-success dpm
 
+suite=stable
+t-commit dpmish-stable 1.0-6 $suite
+
+want-success dpm --new
 
-echo ok.
+t-ok