5 t-dependencies git-buildpackage libfile-fnmatch-perl faketime
7 t-setup-import gdr-convert-gbp
11 t-dgit setup-mergechangelogs
13 : 'non-dgit upload (but we prepare it with dgit anyway)'
21 echo >>newsrc.c "// more upstream"
23 git commit -m 'UPSTREAM NMU'
26 : 'done the nmu, switching back to the maintainer hat'
30 t-dch-commit -v2.0-3 -m 'start -3'
32 t-some-changes 'maintainer'
34 t-git-debrebase stitch
36 git branch did.maintainer
43 t-expect-fail E:'Not.*fast-forward' \
44 git merge --ff-only dgit/dgit/sid
48 git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
50 t-expect-fail 'Automatic merge failed; fix conflicts' \
51 git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
53 git rm -rf debian/patches
54 git commit -m 'Incorporate NMU'
56 git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
65 t-git-debrebase stitch
68 : 'check that what we have is what is expected'
70 git checkout -b compare.nmu origin/master~0
71 git checkout patch-queue/nmu .
72 git rm -rf debian/patches
73 git commit -m 'rm patches nmu'
75 git checkout -b compare.maintainer origin/master~0
76 git checkout did.maintainer .
77 git rm -rf --ignore-unmatch debian/patches
78 git commit --allow-empty -m 'rm patches maintainer'
81 git diff --quiet master
83 : 'check that dgit still likes it'
86 t-dgit -wgf quilt-fixup