X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-diverge-nmu;h=e647f80a0ac8bec16d36df2f6a20a9f56456fe1a;hb=b14d3f59c9aeb589033b7f712a2946e2d21e8b1a;hp=9b37ca62e11622769ab2857de13f6ddadc899702;hpb=2045d087abc4445b98649af8eb4883c05573a324;p=dgit.git

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 9b37ca62..e647f80a 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -56,24 +56,7 @@ 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-nmu-reconciled-good patch-queue/nmu
 
 t-ok