git-debrebase: test suite: gbp2gdr: process incoming

[dgit.git] / tests / setup / gbp2gdr

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 5c2b969f9f85f5f6b53d54af475abfdca06406df..91a9c82095a1c775ea9d370351d10011152433ba 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -48,6 +48,16 @@ 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
@@ -74,64 +84,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