summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 12:52:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 17:42:03 +0100
commit43c0e52162f40e99fbf99ccdfa70abff83472208 (patch)
treef6dd33276703a475c17819b8dbd82153c3000778 /tests
parentb7120584994325d4f6d2963ed336110355349fc6 (diff)
Test suite: t-gbp-example-prep: Arrange to be FF from the archive
Otherwise pushes will necessarily (spuriously) fail.
Diffstat (limited to 'tests')
-rw-r--r--tests/lib4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/lib b/tests/lib
index dd7a67d..b4c1128 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 () {