chiark / gitweb /
tests/tests/quilt: Test series quiltification
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 16 Nov 2014 20:32:58 +0000 (20:32 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 16 Nov 2014 20:39:16 +0000 (20:39 +0000)
tests/tests/quilt
tests/worktrees/ruby-rails-3.2_test.tar

index c9a50e9..e11e1ad 100755 (executable)
@@ -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'
 
index 8c57662..fe01878 100644 (file)
Binary files a/tests/worktrees/ruby-rails-3.2_test.tar and b/tests/worktrees/ruby-rails-3.2_test.tar differ