X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=b4c1128c9a82f834b7490ff83e8750257fe56049;hp=0b8836266fbfc1746a16a09a2d71c10205a19a06;hb=1f80529a13489abd8606d95045d264733390903a;hpb=d3606ff36cbf24f80152c5848fefee0c62686486

diff --git a/tests/lib b/tests/lib
index 0b883626..b4c1128c 100644
--- a/tests/lib
+++ b/tests/lib
@@ -513,9 +513,9 @@ t-apply-diff () {
 }
 
 t-gbp-unapplied-pq2qc () {
-	# does `gbp pq export' (leaving us on BRANCH (eg "quilt-tip"))
+	# does `gbp pq export'
 	# commits the resulting debian/patches on  qc/BRANCH
-	# goes back to patch-queue/BRANCH
+	# leaves us on qc/BRANCH (eg "qc/quilt-tip"))
 	# qc/BRANCH is not fast-forwarding
 
 	gbp pq export
@@ -531,7 +531,31 @@ t-gbp-unapplied-pq2qc () {
 	git checkout qc/$branch
 	git add debian/patches
 	git commit -m 'Commit patch queue'
-	git checkout patch-queue/$branch
+}
+
+t-gbp-example-prep () {
+	t-archive example 1.0-1
+	t-git-none
+	t-worktree 1.0
+
+	cd example
+
+	t-dgit fetch
+
+	git-checkout -b patch-queue/quilt-tip-2 patch-queue/quilt-tip
+	gbp pq rebase
+
+	echo '/* some comment */' >>src.c
+	git add src.c
+	git commit -m 'Add a comment to an upstream file'
+
+	t-gbp-unapplied-pq2qc
+
+	t-commit 'some updates' 1.0-2
+
+	git merge -s ours \
+		-m 'Pseudo-merge to make descendant of archive' \
+		remotes/dgit/dgit/sid
 }
 
 t-commit () {