7 t-tstunt-parsechangelog
8 t-setup-import gdr-convert-gbp
12 t-dgit setup-mergechangelogs
17 t-maintainer-commit-some-changes
21 : 'non-dgit upload (but we prepare it with dgit anyway)'
24 git checkout origin/master
30 t-nmu-commit-an-upstream-change
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
60 t-nmu-reconciled-good patch-queue/nmu