X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fquilt;h=e11e1ad6bf9d2eda869460d8d9b013186853f277;hp=a55e1fbb815bb64f6c8722071a005881707ca717;hb=d45a224aee98c04bf3038dcda9b258ba5abf0d70;hpb=6636efb4b0685da300e45ba057768adcd8f6c3b3

diff --git a/tests/tests/quilt b/tests/tests/quilt
index a55e1fbb..e11e1ad6 100755
--- 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,29 @@ 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 |
+ grep -Fx 'ruby-rails-3.2 (3.2.6-2~dummy1) unstable; urgency=low'
+
 echo ok.