X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-diverge-nmu;h=9fb2c5d565bca696fe6f09813c8a6f1190e48b24;hb=557f90d88992e61580113baa2e4da0b4427d7cb4;hp=4912e6e6ce6fc63d4e15dd46b3ff76b14eb8dbee;hpb=ebf4736038f724689ccc6177d222483fd023866d;p=dgit.git

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 4912e6e6..9fb2c5d5 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -12,6 +12,8 @@ t-dgit setup-mergechangelogs
 
 : '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
@@ -31,6 +33,10 @@ t-some-changes 'maintainer'
 t-git-debrebase
 t-git-debrebase stitch
 
+git branch did.maintainer
+
+t-git-next-date
+
 t-dgit fetch
 t-git-next-date
 
@@ -47,4 +53,36 @@ git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
 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