X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fquilt-splitbrains;h=6886cf89652d6a222b0eb3b38aa36df58581af3d;hb=d436b26183c219a8633f84aa39cf991fd8b6de4d;hp=1e853f31ac60359d764ba0f57f4198c0b1628dcb;hpb=65c48410ed9950ec403b52d8a277a265b3fb7e6d;p=dgit.git

diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index 1e853f31..6886cf89 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
@@ -24,18 +26,15 @@ want-success () {
 	t-refs-same-start
 	t-ref-head
 
-	t-dgit "$@" --quilt=$qmode build-source
+	t-dgit "$@" --quilt=$qmode --dgit-view-save=split.b build-source
 
-	t-dgit "$@" --quilt=$qmode push
+	t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push
 	t-$qmode-pushed-good
 }
 
 
 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
 
@@ -130,5 +129,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