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

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 508f9997..3d8d954a 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -9,15 +9,18 @@ t-setup-import gdr-convert-gbp
 cd $p
 
 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
 }
 
 
 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
@@ -30,6 +33,7 @@ nmu-upload-2 () {
 	dput -c $tmp/dput.cf test-dummy $c
 
 	t-archive-process-incoming sid
+	t-git-next-date
 	cd $p
 	git checkout master
 }
@@ -43,17 +47,29 @@ nmu-upload-2
 
 : 'done the nmu, switching back to the maintainer hat'
 
-t-dgit fetch
-git merge --ff-only dgit/dgit/sid
+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/nmu
+	git diff --exit-code patch-queue/$nmubranch
 
-git branch t.before
+	git branch unlaundered.$nmubranch
 
-t-git-debrebase
-t-gdr-good laundered
+	t-git-debrebase
+
+	t-gdr-good laundered
+
+	t-git-debrebase stitch
+	t-gdr-good stitched
+}
+
+nmu-fold
 
-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