X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Fsetup%2Fgbp2gdr;h=2dbb51548af5f928efd2d9e08ff79695494ae7e4;hb=e13fa49a03cd782945cf142fa94232a183b8e753;hp=5c2b969f9f85f5f6b53d54af475abfdca06406df;hpb=4601685f60bcd8c1749cebb7237da80f025c338b;p=dgit.git

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 5c2b969f..2dbb5154 100755
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -8,8 +8,7 @@ t-dependencies git-buildpackage libfile-fnmatch-perl
 t-tstunt-parsechangelog
 
 not-gdr-processable () {
-	t-expect-fail F:'Cannot cope with this commit' \
-	t-git-debrebase
+	t-git-debrebase analyse | grep 'Unknown Unprocessable'
 }
 
 p=example
@@ -48,15 +47,24 @@ git archive -o ../$ust --prefix=example-2.0/ make-upstream
 git branch -D master
 git branch -m quilt-tip master
 
+for b in \
+		quilt-tip-2		\
+		gitish-only		\
+		quilt-tip-1.1		\
+		patch-queue/quilt-tip	\
+		indep-arch		\
+; do
+	git branch -D $b
+done
+
 : 'see what gbp import-orig does'
 git checkout master
 gbp import-orig --upstream-version=2.0 ../$ust
 
 not-gdr-processable
 
-dch -v 2.0-1 -m 'new upstream (did gbp import-orig)'
-dch -r sid
-git commit -m changelog debian/changelog
+t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
+t-dch-commit -r sid
 
 t-archive-none $p
 t-git-none
@@ -74,64 +82,22 @@ git push --set-upstream origin master
 
 t-git-debrebase -fupstream-has-debian gbp2debrebase
 
-dch -v 2.0-2 -m 'switch to git-debrebase, no other changes'
+v=2.0-2
+dch -v $v -m 'switch to git-debrebase, no other changes'
 dch -r sid
 git commit -m changelog debian/changelog
 
 t-dgit -wgf push-source --new --overwrite
 git push
 
-t-ok
-exit 0
-
-
-git checkout quilt-tip
-git merge --no-edit --allow-unrelated-histories -Xtheirs --no-commit upstream
-git checkout HEAD -- debian
-git commit --no-edit
-
-
-
-false
-
-revision=1
-
-push-to () {
-	t-refs-same-start
-	t-ref-head
-	t-dgit build
-	t-dgit push --new $2
-	t-pushed-good $1 $2
-	t-archive-process-incoming $2
-}
-
-echo ancestor >which
-git add which
-t-commit Ancestor '' stable
-push-to master stable
-
-git checkout -b stable
-
-echo stable >which
-git add which
-t-commit Stable '' stable
-push-to stable stable
-
-git checkout master
-
-majorv=2
-revision=0
-
-echo sid >which
-git add which
-t-commit Sid
-push-to master sid
+cd ..
 
-echo sid-again >>which
-git add which
-t-commit Sid
-push-to master sid
+t-archive-process-incoming sid
 
-t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p"
+t-setup-done '' "$(echo $p*) git mirror salsa aq" '
+	. $troot/lib-gdr
+	t-tstunt-parsechangelog
+	p=example
+'
 
 t-ok