git-debrebase: test: check branch structure, more

[dgit.git] / tests / setup / gbp2gdr

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 8088e9830ae7ab3d5036a91a776002bebcbd3423..3cbc43a8ac56ef6f853c7b57d5edf74cd97e1236 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -7,7 +7,6 @@ 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
@@ -49,66 +48,54 @@ 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
 
-t-git-debrebase -fupstream-has-debian gbp2debrebase
-
-: xxx
-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
-
+dch -v 2.0-1 -m 'new upstream (did gbp import-orig)'
+dch -r sid
+git commit -m changelog debian/changelog
 
+t-archive-none $p
+t-git-none
+t-dgit -wgf --gbp push-source --new
 
-false
+t-salsa-add-remote
+git push --set-upstream origin master
 
-revision=1
+# OK now this looks like something more normal.
+# We have:
+#  maintainer (gbp) view                dgit view
+#    master
+#    debian/2.0-1                          archive/debian/2.0-1
+#    remotes/origin/master                 remotes/dgit/dgit/sid
 
-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
+t-git-debrebase -fupstream-has-debian gbp2debrebase
 
-echo sid >which
-git add which
-t-commit Sid
-push-to master sid
+dch -v 2.0-2 -m 'switch to git-debrebase, no other changes'
+dch -r sid
+git commit -m changelog debian/changelog
 
-echo sid-again >>which
-git add which
-t-commit Sid
-push-to master sid
+t-dgit -wgf push-source --new --overwrite
+git push
 
-t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p"
+cd ..
+t-setup-done '' "$(echo $p*) git mirror salsa aq" '
+       . $troot/lib-gdr
+       t-tstunt-parsechangelog
+       p=example
+'
 
 t-ok