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: gdr-convert-gbp: test snag on unused patches
[dgit.git]
/
tests
/
setup
/
gdr-convert-gbp
diff --git
a/tests/setup/gdr-convert-gbp
b/tests/setup/gdr-convert-gbp
index 6ec374df0a2c645a4f72c1cdbc39c209e503a241..b563c01671358df3fd02446d60abde63e771c9ac 100755
(executable)
--- a/
tests/setup/gdr-convert-gbp
+++ b/
tests/setup/gdr-convert-gbp
@@
-11,6
+11,7
@@
t-dependencies GDR
t-tstunt-parsechangelog
not-gdr-processable () {
t-tstunt-parsechangelog
not-gdr-processable () {
+ git branch gdr-unprocessable/$1
t-git-debrebase analyse | grep 'Unknown Unprocessable'
}
t-git-debrebase analyse | grep 'Unknown Unprocessable'
}
@@
-37,7
+38,7
@@
gbp pq export
git add debian/patches
git commit -m "patch queue update ($0)"
git add debian/patches
git commit -m "patch queue update ($0)"
-not-gdr-processable
+not-gdr-processable
origin
: 'fake up an upstream 2.0'
git branch make-upstream upstream
: 'fake up an upstream 2.0'
git branch make-upstream upstream
@@
-61,11
+62,15
@@
done
git checkout master
gbp import-orig --upstream-version=2.0 ../$ust
git checkout master
gbp import-orig --upstream-version=2.0 ../$ust
-not-gdr-processable
+not-gdr-processable
merge
t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
t-dch-commit-r
t-dch-commit -v 2.0-1 -m 'new upstream (did gbp import-orig)'
t-dch-commit-r
+echo garbage >debian/patches/garbage
+git add debian/patches/garbage
+git commit -m 'add garbage' debian/patches/garbage
+
$ifarchive t-archive-none $p
$ifarchive t-git-none
$ifarchive t-dgit -wgf --gbp push-source --new
$ifarchive t-archive-none $p
$ifarchive t-git-none
$ifarchive t-dgit -wgf --gbp push-source --new
@@
-80,8
+85,16
@@
git push --set-upstream origin master
# debian/2.0-1 archive/debian/2.0-1
# remotes/origin/master remotes/dgit/dgit/sid
# debian/2.0-1 archive/debian/2.0-1
# remotes/origin/master remotes/dgit/dgit/sid
+t-expect-fail E:'identical in upstream files' \
+t-git-debrebase -fupstream-has-debian convert-from-gbp upstream/2.0~
+
+t-expect-fail E:'Unused patch file garbage will be discarded' \
t-git-debrebase -fupstream-has-debian convert-from-gbp
t-git-debrebase -fupstream-has-debian convert-from-gbp
+t-git-debrebase -fupstream-has-debian -funused-patches convert-from-gbp
+
+git branch converted-from-gbp
+
v=2.0-2
t-dch-commit -v $v -m 'switch to git-debrebase, no other changes'
t-dch-commit-r
v=2.0-2
t-dch-commit -v $v -m 'switch to git-debrebase, no other changes'
t-dch-commit-r