diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-08-09 09:41:39 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-08-09 09:41:39 +0100 |
| commit | 49f82e7fe2131175d7c411b1016e42dcb435351d (patch) | |
| tree | 581c57c05be4b782101c91008c73de0228410e4b /tests/setup/gdr-convert-gbp | |
| parent | 113bc577ce8a54f929a3790aedbce81ec320f0c0 (diff) | |
| parent | 66d19f834577d2495c8255f042aff4d86d040049 (diff) | |
Merge tag 'debian/6.6' into stretch-bpo
dgit release 6.6 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Sun 05 Aug 2018 10:43:37 BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
Diffstat (limited to 'tests/setup/gdr-convert-gbp')
| -rwxr-xr-x | tests/setup/gdr-convert-gbp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/setup/gdr-convert-gbp b/tests/setup/gdr-convert-gbp index 6ec374d..a3baf2d 100755 --- 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 () { + git branch gdr-unprocessable/$1 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)" -not-gdr-processable +not-gdr-processable origin : 'fake up an upstream 2.0' git branch make-upstream upstream @@ -61,7 +62,7 @@ done 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 @@ -80,6 +81,9 @@ git push --set-upstream origin master # 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-git-debrebase -fupstream-has-debian convert-from-gbp v=2.0-2 |