X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-diverge-nmu;h=8f0b9cb0135780a9de29d4457f0636c613140a1a;hp=6d14bba1dd1c2750fd6eb97c2f8b9b3e8826fc2b;hb=fe0439371d17132ccb6b7a00f1ee57c0576e44fc;hpb=cb12325ce0b42acee748461d0520d99cd3c3008c

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 6d14bba1..8f0b9cb0 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -18,28 +18,20 @@ 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
-
-t-git-next-date
+v=2.0-3
+t-maintainer-commit-some-changes
 
 t-dgit fetch
 t-git-next-date
 
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+t-nmu-causes-ff-fail
 
 : 'ad hocery'
 
@@ -63,4 +55,7 @@ t-gdr-good laundered
 t-git-debrebase stitch
 t-gdr-good stitched
 
+
+t-nmu-reconciled-good patch-queue/nmu
+
 t-ok