X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-import-dgit;h=17ab2bc6347d7312eb4390c36f1c1156770edebf;hp=c1e9ba9bd814dd01d60f4de8169d8a23db67ebf7;hb=3991eff63504d351b858d3a84392dbb03245946c;hpb=a256823c46da760688493a32ec49e5c2b93cd17a diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit index c1e9ba9b..17ab2bc6 100755 --- a/tests/tests/gdr-import-dgit +++ b/tests/tests/gdr-import-dgit @@ -58,7 +58,6 @@ nmu-fold () { git branch unlaundered.$nmubranch t-git-debrebase - t-gdr-good laundered t-git-debrebase stitch @@ -72,4 +71,24 @@ 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 +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 + +#t-dgit -wgf build-source + +nmu-upload-2 + +: 'done the nmu, back to the maintainer' + +nmu-fold + t-ok