diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-16 12:52:47 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-07-16 17:42:03 +0100 |
commit | 43c0e52162f40e99fbf99ccdfa70abff83472208 (patch) | |
tree | f6dd33276703a475c17819b8dbd82153c3000778 /tests/lib | |
parent | b7120584994325d4f6d2963ed336110355349fc6 (diff) |
Test suite: t-gbp-example-prep: Arrange to be FF from the archive
Otherwise pushes will necessarily (spuriously) fail.
Diffstat (limited to 'tests/lib')
-rw-r--r-- | tests/lib | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 () { |