X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-diverge-nmu;h=82aeaa59275742ddf33207300de932dd334ce2ff;hb=d436b26183c219a8633f84aa39cf991fd8b6de4d;hp=94fd44a6da075bfec8e36170d1c5ae0cc5128625;hpb=8c20e4c90a40d53b6cbcc8e0f523d3aa59ee3ec2;p=dgit.git

diff --git a/tests/tests/gdr-diverge-nmu b/tests/tests/gdr-diverge-nmu
index 94fd44a6..82aeaa59 100755
--- a/tests/tests/gdr-diverge-nmu
+++ b/tests/tests/gdr-diverge-nmu
@@ -2,53 +2,61 @@
 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'
+: 'ad hocery'
 
 t-git-next-date
+git checkout master
+t-nmu-causes-ff-fail
 
-t-dch-commit -v2.0-3 -m 'start -3'
+git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
 
-t-some-changes 'maintainer'
-t-git-debrebase
-t-git-debrebase stitch
+t-expect-fail 'Automatic merge failed; fix conflicts' \
+git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
 
-t-git-next-date
+git rm -rf debian/patches
+git commit -m 'Incorporate NMU'
 
-t-dgit fetch
-t-git-next-date
+git merge -s ours -m 'Declare incorporate NMU' dgit/dgit/sid
 
-t-expect-fail E:'Not.*fast-forward' \
-git merge --ff-only dgit/dgit/sid
+: 'right, how are we'
 
-: 'ad hocery'
+t-git-next-date
 
-git cherry-pick 'dgit/dgit/sid^{/UPSTREAM NMU}'
+t-git-debrebase
+t-gdr-good laundered
 
-t-expect-fail 'Automatic merge failed; fix conflicts' \
-git merge --squash -m 'Incorporate NMU' dgit/dgit/sid
+t-git-debrebase stitch
+t-gdr-good stitched
 
-git rm -rf debian/patches
-git commit -m 'Incorporate NMU'
+
+t-nmu-reconciled-good patch-queue/nmu
 
 t-ok