diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-11-16 20:32:58 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-11-16 20:39:16 +0000 |
commit | e494013b5146a4ac0012cea5d5b1ca41a9712529 (patch) | |
tree | f3749b4b87baf35cca3f6ee9844a2e7f5dd369bd | |
parent | 8c84500206dbe1b1cf4aea1f4b497ab279685066 (diff) |
tests/tests/quilt: Test series quiltification
-rwxr-xr-x | tests/tests/quilt | 17 | ||||
-rw-r--r-- | tests/worktrees/ruby-rails-3.2_test.tar | bin | 133120 -> 215040 bytes |
2 files changed, 17 insertions, 0 deletions
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 Binary files differindex 8c57662..fe01878 100644 --- a/tests/worktrees/ruby-rails-3.2_test.tar +++ b/tests/worktrees/ruby-rails-3.2_test.tar |