X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-import-dgit;h=8ab8beff4cdfdf06a1063da79095006341ce65d5;hb=c92caed36c06b7f804fe3a826afd941329a75a14;hp=bf31ed9ad4c668ea08ebc5d4b9a8a3643e3d32ab;hpb=ff5714f882789163d1a0ff46d737e3e1f6e0e005;p=dgit.git

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index bf31ed9a..8ab8beff 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -4,41 +4,57 @@ 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 () {
+	nmubranch=$1
+	git checkout -f -b $nmubranch
+	t-git-debrebase
+	t-git-debrebase convert-to-gbp
+	# now we are on a gbp patched-unapplied branch
+}
+
 
-git checkout -b nmu
+nmu-upload-2 () {
+	gbp pq import
 
-v=2.0-2+num1
-t-dch-commit -v $v -m nmu
+	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
+}
 
-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
+nmu-upload-2
 
 : 'done the nmu, switching back to the maintainer hat'
 
 cd $p
 git checkout master
-t-dgit pull
+t-dgit fetch
+git merge --ff-only dgit/dgit/sid
 
-git diff --exit-code nmu
+git diff --exit-code patch-queue/nmu
 
 git branch t.before
 
 t-git-debrebase
 t-gdr-good laundered
 
+t-git-debrebase stitch
+t-gdr-good stitched
+
 t-ok