summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/setup/gdr-convert-gbp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp
index 6ec374d..b7e0b7d 100755
--- a/tests/setup/gdr-convert-gbp
+++ b/tests/setup/gdr-convert-gbp
@@ -11,6 +11,7 @@ t-dependencies GDR
t-tstunt-parsechangelog
not-gdr-processable () {
+ git branch gdr-unprocessable/$1
t-git-debrebase analyse | grep 'Unknown Unprocessable'
}
@@ -37,7 +38,7 @@ gbp pq export
git add debian/patches
git commit -m "patch queue update ($0)"
-not-gdr-processable
+not-gdr-processable origin
: 'fake up an upstream 2.0'
git branch make-upstream upstream
@@ -61,7 +62,7 @@ done
git checkout master
gbp import-orig --upstream-version=2.0 ../$ust
-not-gdr-processable
+not-gdr-processable merge
t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
t-dch-commit-r