X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-edits;h=cff33b1d1e791506ac209d2078fbab081d06f570;hp=ffb3305126257c7ba80fa05a860e66f6c1480488;hb=4cb451aa46ad449116f9ff0d1a4450e6dcc01d4f;hpb=bdf0c98adee09e8950bf2f04737308e7746a772a diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index ffb33051..cff33b1d 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -8,21 +8,15 @@ t-setup-import gbp2gdr cd $p +v=2.0-3 +t-dch-commit -v $v -m testing + t-git-debrebase analyse |tee ../anal.1 cat ../anal.1 -echo >>debian/zorkmid '// debian' -git add debian/zorkmid -git commit -m 'DEBIAN add zorkmid' - -echo >>src.c '// upstream' -git commit -a -m 'UPSTREAM edit src.c' +t-some-changes edits -for f in debian/zorkmid src.c; do - echo '// both!' >>$f - git add $f -done -git commit -m 'MIXED add boths' +t-dch-commit -r sid git tag t.before @@ -36,6 +30,10 @@ t-git-debrebase stitch --prose=wombat t-gdr-branch-structure stitched +t-dgit push-source + +t-gdr-branch-structure pushed + : todo 'more tests: convert dgit import new upstream version' : todo 'more tests: convert dgit import same upstream version' : todo 'more tests: other maint updated, we must fetch'