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

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 9fb2c5d5..82aeaa59 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -2,48 +2,39 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl faketime
+t-dependencies GDR
 
+t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp
 
 cd $p
 
 t-dgit setup-mergechangelogs
 
+: 'maintainer'
+
+v=2.0-3
+t-maintainer-commit-some-changes
+
+t-git-next-date
+
 : 'non-dgit upload (but we prepare it with dgit anyway)'
 
 t-git-next-date
+git checkout origin/master
 
 v=2.0-2+nmu1
 t-nmu-upload-1 nmu
 gbp pq import
 t-nmu-upload-2
-echo >>newsrc.c "// more upstream"
-git add newsrc.c
-git commit -m 'UPSTREAM NMU'
+t-nmu-commit-an-upstream-change
 t-nmu-upload-3
 
-: 'done the nmu, switching back to the maintainer hat'
-
-t-git-next-date
-
-t-dch-commit -v2.0-3 -m 'start -3'
-
-t-some-changes 'maintainer'
-t-git-debrebase
-t-git-debrebase stitch
-
-git branch did.maintainer
-
-t-git-next-date
+: 'ad hocery'
 
-t-dgit fetch
 t-git-next-date
-
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
-
-: 'ad hocery'
+git checkout master
+t-nmu-causes-ff-fail
 
 git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
 
@@ -65,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