chiark / gitweb /
Test suite: quilt: Provide Gbp-pq headers in our new patch test case
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 9 Oct 2016 00:13:12 +0000 (01:13 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 10 Oct 2016 00:01:10 +0000 (01:01 +0100)
And expect dgit to honour them

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/quilt
tests/worktrees/ruby-rails-3.2_test.tar

index 37cb8d1..a6f78cd 100755 (executable)
@@ -40,7 +40,7 @@ git merge branch
 iteration
 
 diff <<END - debian/patches/series
-change-something-in-the-upstream-yml
+ups-topic/ups-yml
 spongiform-upstream-new-file-incl-change
 zorkmid-options-=-42
 END
index fe01878..85365fe 100644 (file)
Binary files a/tests/worktrees/ruby-rails-3.2_test.tar and b/tests/worktrees/ruby-rails-3.2_test.tar differ