#!/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/ make-upstream : 'see what gbp import-orig does' git checkout quilt-tip gbp import-orig --debian-branch=quilt-tip --upstream-version=2.0 ../$ust not-gdr-processable t-git-debrebase --force gbp2debrebase : 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