From e494013b5146a4ac0012cea5d5b1ca41a9712529 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 16 Nov 2014 20:32:58 +0000
Subject: tests/tests/quilt: Test series quiltification

---
 tests/tests/quilt                       |  17 +++++++++++++++++
 tests/worktrees/ruby-rails-3.2_test.tar | Bin 133120 -> 215040 bytes
 2 files changed, 17 insertions(+)

diff --git a/tests/tests/quilt b/tests/tests/quilt
index c9a50e9..e11e1ad 100755
--- a/tests/tests/quilt
+++ b/tests/tests/quilt
@@ -32,6 +32,23 @@ iteration () {
 git cherry-pick -x incoming~1; iteration
 git cherry-pick -x incoming~0; iteration
 
+git fetch $tmp/incoming/$p incoming-branch:branch
+git checkout branch
+git rebase --onto dgit/sid incoming
+git checkout dgit/sid
+git merge branch
+iteration
+
+diff <<END - debian/patches/series
+change-something-in-the-upstream-yml
+spongiform-upstream-new-file-incl-change
+zorkmid-options-=-42
+END
+
+for f in `cat debian/patches/series`; do
+	egrep -q '^Author.*ijackson@chiark' debian/patches/$f
+done
+
 t-822-field ../${p}_${v}_*.changes Changes |
  grep -Fx 'ruby-rails-3.2 (3.2.6-2~dummy1) unstable; urgency=low'
 
diff --git a/tests/worktrees/ruby-rails-3.2_test.tar b/tests/worktrees/ruby-rails-3.2_test.tar
index 8c57662..fe01878 100644
Binary files a/tests/worktrees/ruby-rails-3.2_test.tar and b/tests/worktrees/ruby-rails-3.2_test.tar differ
-- 
cgit v1.2.3