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: checkout: Check we end up on the right branch each time
[dgit.git]
/
tests
/
setup
/
gdr-convert-gbp
diff --git
a/tests/setup/gdr-convert-gbp
b/tests/setup/gdr-convert-gbp
index 9bb9983d7871fe542d7f8dbdd2a3f638ef9498b6..e523fd33752f20b8cfbb3e6cefc818d89cfdfe5d 100755
(executable)
--- a/
tests/setup/gdr-convert-gbp
+++ b/
tests/setup/gdr-convert-gbp
@@
-1,9
+1,12
@@
#!/bin/bash
set -e
#!/bin/bash
set -e
+autoimport=
. tests/lib
. $troot/lib-gdr
. tests/lib
. $troot/lib-gdr
-t-dependencies git-buildpackage libfile-fnmatch-perl
+$ifarchive t-setup-import gnupg
+
+t-dependencies GDR
t-tstunt-parsechangelog
t-tstunt-parsechangelog
@@
-63,9
+66,9
@@
not-gdr-processable
t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
t-dch-commit -r sid
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
-t-dgit -wgf --gbp push-source --new
+
$ifarchive
t-archive-none $p
+
$ifarchive
t-git-none
+
$ifarchive
t-dgit -wgf --gbp push-source --new
t-salsa-add-remote
git push --set-upstream origin master
t-salsa-add-remote
git push --set-upstream origin master
@@
-80,21
+83,21
@@
git push --set-upstream origin master
t-git-debrebase -fupstream-has-debian convert-from-gbp
v=2.0-2
t-git-debrebase -fupstream-has-debian convert-from-gbp
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-dch-commit -v $v -m 'switch to git-debrebase, no other changes'
+t-dch-commit -r sid
-t-dgit -wgf push-source --new --overwrite
+
$ifarchive
t-dgit -wgf push-source --new --overwrite
git push
cd ..
git push
cd ..
-t-archive-process-incoming sid
+
$ifarchive
t-archive-process-incoming sid
-t-setup-done '' "$(echo $p*)
git mirror salsa aq
" '
+t-setup-done '' "$(echo $p*)
salsa $($ifarchive echo git mirror aq)
" '
. $troot/lib-gdr
t-tstunt-parsechangelog
p=example
. $troot/lib-gdr
t-tstunt-parsechangelog
p=example
+ t-git-next-date
'
t-ok
'
t-ok