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 dd7a67ddc9dd772d341afade23fc202569782e69..b4c1128c9a82f834b7490ff83e8750257fe56049 100644 (file)
--- 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 () {