From 4323fe5c8a3904f55b18e516b6b02a8e3e0527e4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 19:58:09 +0100 Subject: test suite: gdr-convert-gbp: Break the start out into lib-gdr This will allow us to test other things to do with this conversion without making tests/setup/gdr-convert-gbp more complicated. Signed-off-by: Ian Jackson --- tests/lib-gdr | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'tests/lib-gdr') diff --git a/tests/lib-gdr b/tests/lib-gdr index 9d9fcb4..bda2679 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -329,3 +329,33 @@ t-gdr-prep-new-upstream () { git checkout master t-git-next-date } + +t-gdr-gbp-import-core () { + 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)" + git tag v1.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)" + + : 'make branch names more conventional' + git branch -D master + git branch -m quilt-tip master +} -- cgit v1.2.3