test suite: Fix dependencies of new gdr-merge-conflicts test.

[dgit.git] / tests / lib-gdr

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 9d9fcb461a09025a173f8dc8d23af0b5ee2a8fc5..bda2679ab235468a0a0f2b99be1e122249acdb70 100644 (file)
--- 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
+}