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
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
}
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
---
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
want-success dpm
+suite=stable
+t-commit dpmish-stable 1.0-6 $suite
+
+want-success dpm --new
-echo ok.
+t-ok