chiark / gitweb /
dgit: Set up a merge driver for debian/changelog. Closes:#769291.
[dgit.git] / tests / tests / quilt
1 #!/bin/bash
2 set -e
3 . tests/lib
4
5 t-archive ruby-rails-3.2 3.2.6-1
6 t-git-none
7
8 mkdir -p incoming
9 cd incoming
10 t-worktree test
11 cd ..
12
13 t-dgit clone $p
14
15 cd $p
16 t-cloned-fetched-good
17
18 git fetch $tmp/incoming/$p dgit/sid:incoming
19
20 dummy=0
21
22 iteration () {
23         dummy=$(( $dummy + 1))
24         v=3.2.6-2~dummy${dummy}
25
26         t-refs-same-start
27         t-dgit --dpkg-buildpackage:-d build
28         t-dgit push
29         t-pushed-good dgit/sid
30 }
31
32 git cherry-pick -x incoming~1; iteration
33 git cherry-pick -x incoming~0; iteration
34
35 git fetch $tmp/incoming/$p incoming-branch:branch
36 git checkout branch
37 git rebase --onto dgit/sid incoming
38 git checkout dgit/sid
39 git merge branch
40 iteration
41
42 diff <<END - debian/patches/series
43 change-something-in-the-upstream-yml
44 spongiform-upstream-new-file-incl-change
45 zorkmid-options-=-42
46 END
47
48 for f in `cat debian/patches/series`; do
49         egrep -q '^Author.*ijackson@chiark' debian/patches/$f
50 done
51
52 t-822-field ../${p}_${v}_*.changes Changes |
53  grep -Fx 'ruby-rails-3.2 (3.2.6-2~dummy1) unstable; urgency=low'
54
55 echo ok.