From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Feb 2018 23:07:56 +0000 (+0000)
Subject: git-debrebase: test suite: gdr-diverge-nmu: complete
X-Git-Tag: archive/debian/5.0~158
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=557f90d88992e61580113baa2e4da0b4427d7cb4

git-debrebase: test suite: gdr-diverge-nmu: complete

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 6d14bba1..9fb2c5d5 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -33,6 +33,8 @@ t-some-changes 'maintainer'
 t-git-debrebase
 t-git-debrebase stitch
 
+git branch did.maintainer
+
 t-git-next-date
 
 t-dgit fetch
@@ -63,4 +65,24 @@ 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
diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index 83bd8016..bb6c8d15 100755
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -31,6 +31,6 @@ t-gdr-good pushed
 
 : todo 'more tests: other maint updated, we must fetch'
 : todo 'more tests: other maint updated, alert divergence'
-: todo 'more tests: nmu divergence'
+: todo 'more tests: dgit nmu divergence'
 
 t-ok