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 t-nmu-commit-an-upstream-change
24 : 'done the nmu, switching back to the maintainer hat'
29 t-maintainer-commit-some-changes
34 t-expect-fail E:'Not.*fast-forward' \
35 git merge --ff-only dgit/dgit/sid
39 git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
41 t-expect-fail 'Automatic merge failed; fix conflicts' \
42 git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
44 git rm -rf debian/patches
45 git commit -m 'Incorporate NMU'
47 git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
56 t-git-debrebase stitch
59 : 'check that what we have is what is expected'
61 git checkout -b compare.nmu origin/master~0
62 git checkout patch-queue/nmu .
63 git rm -rf debian/patches
64 git commit -m 'rm patches nmu'
66 git checkout -b compare.maintainer origin/master~0
67 git checkout did.maintainer .
68 git rm -rf --ignore-unmatch debian/patches
69 git commit --allow-empty -m 'rm patches maintainer'
72 git diff --quiet master
74 : 'check that dgit still likes it'
77 t-dgit -wgf quilt-fixup