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=19918d8bc5e546fea77e7a9803231da20c2ae731;hp=5d4015709619aabd85b508bd7d72d8540ed7bc2f;hb=047db2064cbc162d8fceff77ec6dd38eab135c6c;hpb=c53c58baf0425eaa76826725264dc909b46a4f7c

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