X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fforcesplit-overwrite;h=9600d3a8887d1d424e4b65e1562fc2172c82db2c;hb=467846c8b31edae2e091e6ecf232fecefa32e247;hp=0afb5cedbee7301782cfc9f2612fb956791d01c6;hpb=0e7aa587520399fcba122b4d91453bf4ec19e20d;p=dgit.git

diff --git a/tests/tests/forcesplit-overwrite b/tests/tests/forcesplit-overwrite
index 0afb5ced..9600d3a8 100755
--- a/tests/tests/forcesplit-overwrite
+++ b/tests/tests/forcesplit-overwrite
@@ -2,14 +2,36 @@
 set -e
 . tests/lib
 
+# This tests a native package with split view, including that the
+# pseudomerges end up in the right place.
+
 t-setup-import examplegit
 
+t-select-package example
 cd example
 
 suite=stable
 
 t-commit 'No changes, just send to stable' '' stable
 
-t-dgit -wgf --split-view --overwrite=1.2 push-source stable
+t-refs-same-start
+t-ref-head
+
+try () {
+	t-dgit -wgf --split-view "$@" --dgit-view-save=split.p \
+		push-source stable
+}
+
+t-expect-fail E:'maintainer view tag.*not fast forward' \
+try
+
+t-expect-fail F:'debian/changelog does not mention 1.2' \
+try --overwrite
+
+try --overwrite=1.2
+git branch -f split.b split.p
+
+t-ref-head
+t-split-unchanged-pushed-good $suite
 
 t-ok