X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-newupstream-v0;fp=tests%2Ftests%2Fgdr-newupstream-v0;h=0000000000000000000000000000000000000000;hb=39ae9e0589506313a69abf7a85155085b1d1147b;hp=536f49c218d2ea90afac7057d9d9017bf5ce4454;hpb=375a065009f11f786116a81d8d3a1edde32fe96b;p=dgit.git diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0 deleted file mode 100755 index 536f49c2..00000000 --- a/tests/tests/gdr-newupstream-v0 +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -set -e -. tests/lib - -t-dependencies NO-DGIT GDR - -t-setup-import gdr-convert-gbp-noarchive - -cd $p - -: 'upstream hat' - -new-upstream () { - uv=$1 - t-git-next-date - git checkout make-upstream - git reset --hard upstream - t-make-new-upstream-tarball $uv - git push . make-upstream:upstream - git checkout master - t-git-next-date -} - -new-upstream 2.1 - -: 'maintainer hat' - -git branch startpoint -v=2.1-1 - -git checkout master - -t-expect-fail F:'Could not determine appropriate upstream commitish' \ -t-git-debrebase new-upstream $v - -git tag v2.1 upstream - -t-git-debrebase new-upstream $v -t-gdr-good laundered - -t-git-debrebase stitch -t-gdr-good stitched - -git branch ordinary - -: 'with --anchor' - -git reset --hard startpoint - -t-git-debrebase analyse >../anal.anch -anchor=$(perl <../anal.anch -ne ' - next unless m/^(\w+) Anchor\s/; - print $1,"\n"; - exit; -') - -t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream -t-gdr-good laundered - -t-git-debrebase stitch -t-gdr-good stitched - -git diff --quiet ordinary - -t-ok