test suite: gbp2gdr: drop junk at the end

[dgit.git] / tests / setup / gbp2gdr

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 8088e9830ae7ab3d5036a91a776002bebcbd3423..ddb0d031b756c941f2d168bec2b48de1410630ae 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
@@ -55,60 +54,31 @@ gbp import-orig --upstream-version=2.0 ../$ust
 
 not-gdr-processable
 
-t-git-debrebase -fupstream-has-debian gbp2debrebase
+dch -v 2.0-1 -m 'new upstream (did gbp import-orig)'
+dch -r sid
+git commit -m changelog debian/changelog
 
-: xxx
-t-ok
-exit 0
+t-archive-none $p
+t-git-none
+t-dgit -wgf --gbp push-source --new
 
+t-salsa-add-remote
+git push --set-upstream origin master
 
-git checkout quilt-tip
-git merge --no-edit --allow-unrelated-histories -Xtheirs --no-commit upstream
-git checkout HEAD -- debian
-git commit --no-edit
-
+# 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
 
+t-git-debrebase -fupstream-has-debian gbp2debrebase
 
-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
-
-echo sid-again >>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
 
-t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p"
+t-dgit -wgf push-source --new --overwrite
+git push
 
 t-ok