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
41 t-expect-fail E:'Not.*fast-forward' \
42 git merge --ff-only dgit/dgit/sid
46 git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
48 t-expect-fail 'Automatic merge failed; fix conflicts' \
49 git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
51 git rm -rf debian/patches
52 git commit -m 'Incorporate NMU'
54 git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
63 t-git-debrebase stitch