diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-10 11:27:30 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | aceda86bc2122516ff910858f7851df38f99a279 (patch) | |
tree | ea30ff277225c6b10799089de9b0004837b05c7f /tests/setup | |
parent | bc5f555f9853dabf9bcd13ca425b4728b1037ea9 (diff) |
test suite: initial git-debrebase setup attempts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/setup')
-rwxr-xr-x | tests/setup/gbp2gdr | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr new file mode 100755 index 0000000..b256101 --- /dev/null +++ b/tests/setup/gbp2gdr @@ -0,0 +1,107 @@ +#!/bin/bash +set -e +. tests/lib +. $troot/lib-gdr + +t-dependencies git-buildpackage + +t-tstunt-parsechangelog + + +not-gdr-processable () { + t-expect-fail F:'Cannot cope with this commit' \ + t-git-debrebase +} + +p=example +t-worktree 1.1 + +cd example + +: 'fake up some kind of upstream' +git checkout -b upstream quilt-tip +rm -rf debian +mkdir debian +echo junk >debian/rules +git add debian +git commit -m "an upstream retcon ($0)" + +: 'fake up that our quilt-tip was descended from upstream' +git checkout quilt-tip +git merge --no-edit -s ours upstream + +: 'fake up that our quilt-tip had the patch queue in it' +git checkout patch-queue/quilt-tip +gbp pq export +git add debian/patches +git commit -m "patch queue update ($0)" + +not-gdr-processable + +: 'fake up an upstream 2.0' +git checkout -b make-upstream upstream +echo upstream-v2 >>docs/README +git commit -a -m "an upstream v2 update" +ust=example_2.0.orig.tar.gz +git archive -o ../$ust --prefix=example-2.0/ upstream + +: 'see what gbp import-orig does' +gbp import-orig --debian-branch=quilt-tip --upstream-version=2.0 ../$ust + +not-gdr-processable + +: xxx +t-ok +exit 0 + + +git checkout quilt-tip +git merge --no-edit --allow-unrelated-histories -Xtheirs --no-commit upstream +git checkout HEAD -- debian +git commit --no-edit + + + +false + +revision=1 + +push-to () { + t-refs-same-start + t-ref-head + t-dgit build + t-dgit push --new $2 + t-pushed-good $1 $2 + t-archive-process-incoming $2 +} + +echo ancestor >which +git add which +t-commit Ancestor '' stable +push-to master stable + +git checkout -b stable + +echo stable >which +git add which +t-commit Stable '' stable +push-to stable stable + +git checkout master + +majorv=2 +revision=0 + +echo sid >which +git add which +t-commit Sid +push-to master sid + +echo sid-again >>which +git add which +t-commit Sid +push-to master sid + +t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p" + +t-ok |