set -e
. tests/lib
-t-dependencies git-buildpackage libfile-fnmatch-perl
+t-dependencies GDR
+t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp
cd $p
-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
-}
-
-
-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
-
- cd ..
- c=${p}_${v}_source.changes
- debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
- dput -c $tmp/dput.cf test-dummy $c
-
- t-archive-process-incoming sid
- cd $p
- git checkout master
-}
-
: 'non-dgit upload (but we prepare it with dgit anyway)'
v=2.0-2+nmu1
-nmu-upload-1 nmu
+t-nmu-upload-1 nmu
gbp pq import
-nmu-upload-2
+t-nmu-upload-2
+t-some-changes $numbranch
+t-nmu-upload-3
: '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
+ 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-dch-commit-r
t-dgit -wgf push-source
+: 'now test a new upstream'
+
+t-make-new-upstream-tarball 2.1
+
+git checkout master
+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
+
+: 'done the nmu, back to the maintainer'
+
+nmu-fold
+
t-ok