summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-10 19:48:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-07-16 16:47:48 +0100
commit0d6cdd1cec853a132aacc3f52c1cb7c585e02da5 (patch)
treee696bd685ffa9ce33d3429b758a192e285cd6276 /tests
parent0186359c7750e539739ce8f791e93ab6119ec8e0 (diff)
Test suite: unapplied-pq2qc: leave us on the qc/ branch
The patch queue branch is not really very useful. Certainly, the build tests will require the patch queue branch.
Diffstat (limited to 'tests')
-rw-r--r--tests/lib5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/lib b/tests/lib
index c51c4a6..dd7a67d 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,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 () {