: 'non-dgit upload (but we prepare it with dgit anyway)'
+t-git-next-date
+
v=2.0-2+nmu1
t-nmu-upload-1 nmu
gbp pq import
t-git-debrebase
t-git-debrebase stitch
+git branch did.maintainer
+
+t-git-next-date
+
t-dgit fetch
t-git-next-date
git rm -rf debian/patches
git commit -m 'Incorporate NMU'
+git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
+
+: 'right, how are we'
+
+t-git-next-date
+
+t-git-debrebase
+t-gdr-good laundered
+
+t-git-debrebase stitch
+t-gdr-good stitched
+
+: 'check that what we have is what is expected'
+
+git checkout -b compare.nmu origin/master~0
+git checkout patch-queue/nmu .
+git rm -rf debian/patches
+git commit -m 'rm patches nmu'
+
+git checkout -b compare.maintainer origin/master~0
+git checkout did.maintainer .
+git rm -rf --ignore-unmatch debian/patches
+git commit --allow-empty -m 'rm patches maintainer'
+
+git merge compare.nmu
+git diff --quiet master
+
+: 'check that dgit still likes it'
+
+git checkout master
+t-dgit -wgf quilt-fixup
+
t-ok