X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-import-dgit;h=c4ca1ba053166babd0de2e8e50a77bd075161b34;hb=81b54cfc353832f717ad514b7c6a14e55a380b7d;hp=2d77d43017e33d33a49e4e25241720c326253d6e;hpb=a04c715cb3760cdc51f952e199381297ce3e7d4f;p=dgit.git

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 2d77d430..c4ca1ba0 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -8,15 +8,18 @@ t-setup-import gdr-convert-gbp
 
 cd $p
 
-: 'non-dgit upload (but we prepare it with dgit anyway)'
-
-git checkout -b nmu
-
-nmu-upload () {
-	t-dch-commit -v $v -m nmu
+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
+}
 
-	t-some-changes nmu
 
+nmu-upload-2 () {
+	t-dch-commit -v $v -m "nmu $nmubranch $v"
+	t-some-changes "nmu $numbranch $v"
 	t-dch-commit -r sid
 
 	t-dgit -wgf build-source
@@ -27,19 +30,23 @@ nmu-upload () {
 	dput -c $tmp/dput.cf test-dummy $c
 
 	t-archive-process-incoming sid
+	cd $p
+	git checkout master
 }
 
-v=2.0-2+num1
-nmu-upload
+: 'non-dgit upload (but we prepare it with dgit anyway)'
+
+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 fetch
 git merge --ff-only dgit/dgit/sid
 
-git diff --exit-code nmu
+git diff --exit-code patch-queue/nmu
 
 git branch t.before
 
@@ -49,4 +56,9 @@ t-gdr-good laundered
 t-git-debrebase stitch
 t-gdr-good stitched
 
+v=2.0-3
+t-dch-commit -v $v -m "incorporate nmu"
+t-dch-commit -r sid
+t-dgit -wgf push-source
+
 t-ok