From 16f71c0bfd026cafacd9a5fad1404e457ae55b78 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 18 Jun 2019 18:58:05 +0100
Subject: [PATCH] test suite: forcesplit-overwrite: Check -pushed-good

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 tests/lib                        |  8 ++++++++
 tests/tests/forcesplit-overwrite | 13 ++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/tests/lib b/tests/lib
index 248dca56..00ef4170 100644
--- a/tests/lib
+++ b/tests/lib
@@ -736,6 +736,7 @@ t-splitbrain-pushed-good--unpack () {
 	ln -s $tmp/incoming/*.orig*.tar* . ||:
 	ln -s $incoming_dsc .
 	ln -s ${incoming_dsc/.dsc/.debian.tar}* .
+	ln -s ${incoming_dsc/.dsc/.tar}* . ||:
 	dpkg-source "$@" -x *.dsc
 	cd */.
 	git init
@@ -845,6 +846,13 @@ t-dpm-pushed-good () {
 	t-splitbrain-pushed-good-end-made-dep14
 }
 
+t-split-unchanged-pushed-good () {
+	local suite=${1:-sid}
+	t-splitbrain-pushed-good-start
+	t-splitbrain-pushed-good--unpack
+	t-splitbrain-pushed-good-end-made-dep14
+}
+
 t-commit-build-push-expect-log () {
 	local msg=$1
 	local mpat=$2
diff --git a/tests/tests/forcesplit-overwrite b/tests/tests/forcesplit-overwrite
index 0afb5ced..d07d65a0 100755
--- a/tests/tests/forcesplit-overwrite
+++ b/tests/tests/forcesplit-overwrite
@@ -2,14 +2,25 @@
 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
+
+t-dgit -wgf --split-view --overwrite=1.2 --dgit-view-save=split.p push-source stable
+git branch -f split.b split.p
+
+t-ref-head
+t-split-unchanged-pushed-good $suite
 
 t-ok
-- 
2.30.2