7 t-setup-import gdr-convert-gbp
11 t-dgit setup-mergechangelogs
16 t-maintainer-commit-some-changes
20 : 'non-dgit upload (but we prepare it with dgit anyway)'
23 git checkout origin/master
29 t-nmu-commit-an-upstream-change
38 git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
40 t-expect-fail 'Automatic merge failed; fix conflicts' \
41 git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
43 git rm -rf debian/patches
44 git commit -m 'Incorporate NMU'
46 git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
55 t-git-debrebase stitch
59 t-nmu-reconciled-good patch-queue/nmu