chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test suite: gbp2gdr: call t-setup-done
[dgit.git]
/
tests
/
setup
/
gbp2gdr
diff --git
a/tests/setup/gbp2gdr
b/tests/setup/gbp2gdr
index da238f4bdaeb8e34384e0715c90ff7da71b93523..2317db62b56291768f02deff4a7b52e558a56248 100755
(executable)
--- a/
tests/setup/gbp2gdr
+++ b/
tests/setup/gbp2gdr
@@
-3,11
+3,10
@@
set -e
. tests/lib
. $troot/lib-gdr
. tests/lib
. $troot/lib-gdr
-t-dependencies git-buildpackage
+t-dependencies git-buildpackage
libfile-fnmatch-perl
t-tstunt-parsechangelog
t-tstunt-parsechangelog
-
not-gdr-processable () {
t-expect-fail F:'Cannot cope with this commit' \
t-git-debrebase
not-gdr-processable () {
t-expect-fail F:'Cannot cope with this commit' \
t-git-debrebase
@@
-45,66
+44,48
@@
git commit -a -m "an upstream v2 update"
ust=example_2.0.orig.tar.gz
git archive -o ../$ust --prefix=example-2.0/ make-upstream
ust=example_2.0.orig.tar.gz
git archive -o ../$ust --prefix=example-2.0/ make-upstream
+: 'make branch names more conventional'
+git branch -D master
+git branch -m quilt-tip master
+
: 'see what gbp import-orig does'
: 'see what gbp import-orig does'
-git checkout
quilt-tip
-gbp import-orig --
debian-branch=quilt-tip --
upstream-version=2.0 ../$ust
+git checkout
master
+gbp import-orig --upstream-version=2.0 ../$ust
not-gdr-processable
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
+t-salsa-add-remote
+git push --set-upstream origin master
-false
+# 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
-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
+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
t-ok