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=4912e6e6ce6fc63d4e15dd46b3ff76b14eb8dbee;hb=HEAD;hpb=ebf4736038f724689ccc6177d222483fd023866d

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 4912e6e6..82aeaa59 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -2,42 +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
+: '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}'
 
@@ -47,4 +44,19 @@ 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
+
+
+t-nmu-reconciled-good patch-queue/nmu
+
 t-ok