Split brain: When pushing, find the dgit view in the cache

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index c51c4a6146a50230fed33afc80a41f78e222a08c..b4c1128c9a82f834b7490ff83e8750257fe56049 100644 (file)
--- 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,6 @@ 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 () {
@@ -553,6 +552,10 @@ t-gbp-example-prep () {
        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 () {