From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Jul 2016 11:52:47 +0000 (+0100)
Subject: Test suite: t-gbp-example-prep: Arrange to be FF from the archive
X-Git-Tag: archive/debian/2.0~270
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=43c0e52162f40e99fbf99ccdfa70abff83472208;ds=inline

Test suite: t-gbp-example-prep: Arrange to be FF from the archive

Otherwise pushes will necessarily (spuriously) fail.
---

diff --git a/tests/lib b/tests/lib
index dd7a67dd..b4c1128c 100644
--- a/tests/lib
+++ b/tests/lib
@@ -552,6 +552,10 @@ t-gbp-example-prep () {
 	t-gbp-unapplied-pq2qc
 
 	t-commit 'some updates' 1.0-2
+
+	git merge -s ours \
+		-m 'Pseudo-merge to make descendant of archive' \
+		remotes/dgit/dgit/sid
 }
 
 t-commit () {