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

diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index 8ab8beff..17ab2bc6 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -2,24 +2,25 @@
 set -e
 . tests/lib
 
-t-dependencies git-buildpackage libfile-fnmatch-perl
+t-dependencies git-buildpackage libfile-fnmatch-perl faketime
 
 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 () {
-	gbp pq import
-
+	t-git-next-date
 	t-dch-commit -v $v -m "nmu $nmubranch $v"
 	t-some-changes "nmu $numbranch $v"
 	t-dch-commit -r sid
@@ -32,29 +33,62 @@ 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
 }
 
 : '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
+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 unlaundered.$nmubranch
+
+	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
+
+: 'now test a new upstream'
+
+t-make-new-upstream-tarball 2.1
+
 git checkout master
-t-dgit fetch
-git merge --ff-only dgit/dgit/sid
+v=2.1-0+nmu1
+nmu-upload-1 nmu2
+
+gbp import-orig --upstream-version=2.1 --debian-branch=nmu2 ../$ust
+t-dch-commit -v $v -m "new upstream $v"
+gbp pq import
 
-git diff --exit-code patch-queue/nmu
+#t-dgit -wgf build-source
 
-git branch t.before
+nmu-upload-2
 
-t-git-debrebase
-t-gdr-good laundered
+: 'done the nmu, back to the maintainer'
 
-t-git-debrebase stitch
-t-gdr-good stitched
+nmu-fold
 
 t-ok