X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-import-dgit;h=3d8d954ae720460176773d54a4797965f0f66690;hp=5d4015709619aabd85b508bd7d72d8540ed7bc2f;hb=5b79751a25c556b457c0c429041bee2219d552f0;hpb=c53c58baf0425eaa76826725264dc909b46a4f7c

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 5d401570..3d8d954a 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -4,38 +4,72 @@ set -e
 
 t-dependencies git-buildpackage libfile-fnmatch-perl
 
-t-setup-import gbp2gdr
+t-setup-import gdr-convert-gbp
 
 cd $p
 
-: 'non-dgit upload (but we prepare it with dgit anyway)'
+nmu-upload-1 () {
+	t-git-next-date
+	nmubranch=$1
+	git checkout -f -b $nmubranch
+	t-git-debrebase
+	t-git-debrebase convert-to-gbp
+	t-git-next-date
+	# now we are on a gbp patched-unapplied branch
+}
 
-git checkout -b nmu
 
-v=2.0-2+num1
-t-dch-commit -v $v -m nmu
+nmu-upload-2 () {
+	t-git-next-date
+	t-dch-commit -v $v -m "nmu $nmubranch $v"
+	t-some-changes "nmu $numbranch $v"
+	t-dch-commit -r sid
 
-t-some-changes nmu
+	t-dgit -wgf build-source
 
-t-dch-commit -r sid
+	cd ..
+	c=${p}_${v}_source.changes
+	debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+	dput -c $tmp/dput.cf test-dummy $c
 
-t-dgit -wgf build-source
+	t-archive-process-incoming sid
+	t-git-next-date
+	cd $p
+	git checkout master
+}
 
-cd ..
-c=${p}_${v}_source.changes
-debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-dput -c $tmp/dput.cf test-dummy $c
+: 'non-dgit upload (but we prepare it with dgit anyway)'
 
-t-archive-process-incoming sid
+v=2.0-2+nmu1
+nmu-upload-1 nmu
+gbp pq import
+nmu-upload-2
 
 : 'done the nmu, switching back to the maintainer hat'
 
-cd $p
-git checkout master
-t-dgit pull
+nmu-fold () {
+	t-git-next-date
+	t-dgit fetch
+	t-git-next-date
+	git merge --ff-only dgit/dgit/sid
+
+	git diff --exit-code patch-queue/$nmubranch
 
-git branch t.before
+	git branch unlaundered.$nmubranch
 
-: t-git-debrebase launder
+	t-git-debrebase
+
+	t-gdr-good laundered
+
+	t-git-debrebase stitch
+	t-gdr-good stitched
+}
+
+nmu-fold
+
+v=2.0-3
+t-dch-commit -v $v -m "incorporate nmu"
+t-dch-commit -r sid
+t-dgit -wgf push-source
 
 t-ok