5 t-archive ruby-rails-3.2 3.2.6-1
18 git fetch $tmp/incoming/$p dgit/sid:incoming
23 dummy=$(( $dummy + 1))
24 v=3.2.6-2~dummy${dummy}
27 t-dgit --dpkg-buildpackage:-d build
29 t-pushed-good dgit/sid
32 git cherry-pick -x incoming~1; iteration
33 git cherry-pick -x incoming~0; iteration
35 git fetch $tmp/incoming/$p incoming-branch:branch
37 git rebase --onto dgit/sid incoming
42 diff <<END - debian/patches/series
44 spongiform-upstream-new-file-incl-change
48 for f in `cat debian/patches/series`; do
49 egrep -q '^From.*ijackson@chiark' debian/patches/$f
52 t-822-field ../${p}_${v}_*.changes Changes |
53 grep -Fx 'ruby-rails-3.2 (3.2.6-2~dummy1) unstable; urgency=low'
57 # Now we are going to check that our dgit-generated patches round
58 # trip to similar git commits when imported by gbp pq:
62 # We need to make a patches-unapplied version
63 unpa=$(git log --pretty=format:'%H' --grep '^\[dgit import unpatched')
64 git checkout -b for-gbp
71 export GIT_AUTHOR_NAME='Someone Else'
72 export GIT_AUTHOR_EMAIL='else@example.com'
73 export GIT_COMMITTER_NAME='Someone Else'
74 export GIT_COMMITTER_EMAIL='else@example.com'
78 for compare in $(git log --pretty='format:%H' \
79 --grep 'Change something in the upstream yml')
81 git cat-file commit $compare >../this.cmp
83 perl -i~$compare~ -0777 -pe '
85 s/^(?:committer|parent|tree) .*\n//gm;
86 s/\n+(\(cherry picked from .*\)\n)\n*/\n\n/m
90 if test -f ../last.cmp; then
91 diff -u ../last.cmp ../this.cmp
93 mv ../this.cmp ../last.cmp