X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib-gdr;h=bda2679ab235468a0a0f2b99be1e122249acdb70;hb=4323fe5c8a3904f55b18e516b6b02a8e3e0527e4;hp=9d9fcb461a09025a173f8dc8d23af0b5ee2a8fc5;hpb=d5a58eb3a50f0df4a764d9aa301f3f130c4b2465;p=dgit.git

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 9d9fcb46..bda2679a 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
+}