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=e647f80a0ac8bec16d36df2f6a20a9f56456fe1a;hb=89108c5f44ad57febbb24a28d605a5c6322d14c2;hpb=b14d3f59c9aeb589033b7f712a2946e2d21e8b1a

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index e647f80a..82aeaa59 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -2,17 +2,26 @@
 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
@@ -21,20 +30,11 @@ t-nmu-upload-2
 t-nmu-commit-an-upstream-change
 t-nmu-upload-3
 
-: 'done the nmu, switching back to the maintainer hat'
-
-t-git-next-date
-
-v=2.0-3
-t-maintainer-commit-some-changes
+: '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}'