X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-splitbrains;h=f8d8091f38504324a7e57fe1cc81a389185afebe;hb=HEAD;hp=fca142200861eec0edde91ec9dd508f5d7fc0b93;hpb=f70037ab8f3add21e3fa9f708f949caf6fcbc23c;p=dgit.git

diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index fca14220..f8d8091f 100755
--- a/tests/tests/quilt-splitbrains
+++ b/tests/tests/quilt-splitbrains
@@ -2,6 +2,8 @@
 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
@@ -10,8 +12,6 @@ set -e
 
 t-tstunt-parsechangelog
 
-t-newtag
-
 # Easiest way to make a patches-unapplied but not-gbp tree is
 # to take the patches-unapplied tree and by-hand commit the .gitignore
 # changes as a debian patch.
@@ -21,20 +21,18 @@ 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-$qmode-pushed-good
+
+	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 $suite
 }
 
 
 echo "===== testing tree suitable for --quilt=gbp (only) ====="
 
-t-expect-fail 'grep: new-upstream-file: No such file or directory' \
-t-dgit --quilt=dpm build-source
-
 t-expect-fail 'git tree differs from result of applying' \
 t-dgit -wgf --quilt=dpm build-source
 
@@ -58,7 +56,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
@@ -129,5 +127,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