#!/bin/bash
set -e
. tests/lib

t-archive ruby-rails-3.2 3.2.6-1
t-git-none

mkdir -p incoming
cd incoming
t-worktree test
cd ..

t-dgit clone $p

cd $p
t-cloned-fetched-good

git fetch $tmp/incoming/$p dgit/sid:incoming

dummy=0

iteration () {
	dummy=$(( $dummy + 1))
	v=3.2.6-2~dummy${dummy}

	t-refs-same-start
	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.