tests/tests/quilt: Test series quiltification

[dgit.git] / tests / tests / quilt

diff --git a/tests/tests/quilt b/tests/tests/quilt
index 9a4b105741ffaf3f5d76c1e9d323acddcc0f83b8..e11e1ad6bf9d2eda869460d8d9b013186853f277 100755 (executable)
--- a/tests/tests/quilt
+++ b/tests/tests/quilt
@@ -19,9 +19,7 @@ git fetch $tmp/incoming/$p dgit/sid:incoming
 
 dummy=0
 
-for cherry in incoming~1 incoming~0; do
-       git cherry-pick -x $cherry
-
+iteration () {
        dummy=$(( $dummy + 1))
        v=3.2.6-2~dummy${dummy}
 
@@ -29,6 +27,26 @@ for cherry in incoming~1 incoming~0; do
        t-dgit --dpkg-buildpackage:-d build
        t-dgit push
        t-pushed-good dgit/sid
+}
+
+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 |