chiark / gitweb /
Test suite: t-gbp-example-prep: Arrange to be FF from the archive
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 11:52:47 +0000 (12:52 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 16:42:03 +0000 (17:42 +0100)
Otherwise pushes will necessarily (spuriously) fail.

tests/lib

index dd7a67d..b4c1128 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
        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 () {
 }
 
 t-commit () {