Package: git-buildpackage
Version: 0.9.1
Severity: normal
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hello,
While importing upstream's version 0.36.0 of package guitarix, I've found that
`gbp --import-orig --merge-mode=replace` and `--merge-mode=auto` behaves as
`--merge-mode=merge`. To reproduce do:
I've reproduced this bug against gbp 0.9.1 and 0.9.2. Please see attached
output on clean unstable machine.
Kind regards,
- -- System Information:
Debian Release: buster/sid
APT prefers testing-debug
APT policy: (500, 'testing-debug'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.13.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages git-buildpackage depends on:
ii devscripts 2.17.11
ii git 1:2.15.0-1
ii man-db 2.7.6.1-2
ii python3 3.6.3-2
ii python3-dateutil 2.6.1-1
ii python3-pkg-resources 36.6.0-1
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.85
ii pbuilder 0.229
ii pristine-tar 1.42
ii python3-requests 2.18.1-1
ii sbuild 0.73.0-4
Versions of packages git-buildpackage suggests:
pn python3-notify2 <none>
ii sudo 1.8.21p2-2
ii unzip 6.0-21
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEELLKv6mdE0z94m2FAIj8VylqvDngFAloLPVYACgkQIj8Vylqv
DnjIbwgAwWxoIQTTb4mvkOtk7c2boYolotWByaUxa2wmb1GVUgJIVVidjq3lWIah
7CQRULeD58T5nMSkxZ4Dbx4G1P39OQZgIuTlwejRn55NrAntxSJKsIH8nJVhUc96
yrwtCDlTa0jocMuSJDdhyEvGJOEXYqwvru6gRvBGUZW60vnQqPaXMa0vM48RWOaV
2fZ8rOeH2t8W0sWdsWDOMbWCo0Os4Wj/pbWYf/bJxhalupvS4ZMjdSCKl0o+l9q5
TXJICcv2zkGS7hCECddMtdSzhpTJYH8A4kiV7qbPTBUOTDxm0ya54A3QtWDi6Lpe
caUPdPRhPU7HTtHlcomWGLSEeL0nVw==
=ABdf
-----END PGP SIGNATURE-----
root@desktop:~# git clone git://anonscm.debian.org/pkg-multimedia/guitarix.git
guitarix && cd guitarix
Cloning into 'guitarix'...
remote: Counting objects: 11042, done.
remote: Compressing objects: 100% (4054/4054), done.
remote: Total 11042 (delta 7947), reused 9746 (delta 6821)
Receiving objects: 100% (11042/11042), 88.77 MiB | 4.60 MiB/s, done.
Resolving deltas: 100% (7947/7947), done.
root@desktop:~/guitarix# git fetch origin upstream:upstream
pristine-tar:pristine-tar
>From git://anonscm.debian.org/pkg-multimedia/guitarix
* [new branch] upstream -> upstream
* [new branch] pristine-tar -> pristine-tar
root@desktop:~/guitarix# gbp import-orig --pristine-tar --uscan --verbose
--merge-mode=replace
gbp:debug: ['git', 'rev-parse', '--show-cdup']
gbp:debug: ['git', 'rev-parse', '--is-bare-repository']
gbp:debug: ['git', 'rev-parse', '--git-dir']
gbp:debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/']
gbp:debug: ['git', 'show-ref', 'refs/heads/upstream']
gbp:debug: ['git', 'status', '--porcelain']
gbp:info: Launching uscan...
uscan: Newest version of guitarix on remote site is 0.36.0, local version is
0.35.6
uscan: => Newer package available from
http://qa.debian.org/watch/sf.php/guitarix/guitarix2-0.36.0.tar.xz
gbp:info: Using uscan downloaded tarball ../guitarix_0.36.0.orig.tar.xz
What is the upstream version? [0.36.0]
gbp:debug: ['git', 'tag', '-l', 'upstream/0.36.0']
gbp:debug: tar ['-C', '../tmp2_xslh4t', '-a', '-xf',
'../guitarix_0.36.0.orig.tar.xz'] []
gbp:debug: Unpacked '../guitarix_0.36.0.orig.tar.xz' to
'../tmp2_xslh4t/guitarix-0.36.0'
gbp:info: Importing '../guitarix_0.36.0.orig.tar.xz' to branch 'upstream'...
gbp:info: Source package is guitarix
gbp:info: Upstream version is 0.36.0
gbp:debug: ['git', 'show-ref', 'refs/heads/upstream']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream']
gbp:debug: ['git', 'add', '-f', '.']
gbp:debug: ['git', 'write-tree']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream']
gbp:debug: ['git', 'commit-tree', '3e9fc90df9d883cc4ee657c9466ea835336eeb94',
'-p', 'b71e4eb38c6b8d9a35d1e88d6ff72a095a7cb7b1']
gbp:debug: ['git', 'update-ref', '-m', 'gbp: New upstream version 0.36.0',
'refs/heads/upstream', '87a3e934062d1ad81c6d9c557afe8b94ffc6a17d',
'b71e4eb38c6b8d9a35d1e88d6ff72a095a7cb7b1']
gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'pristine-tar']
gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--']
gbp:debug: ['git', 'mktree', '-z']
gbp:debug: pristine-tar [] ['commit', '../guitarix_0.36.0.orig.tar.xz',
'3e9fc90df9d883cc4ee657c9466ea835336eeb94']
gbp:debug: ['git', 'tag', '-m', 'Upstream version 0.36.0', 'upstream/0.36.0',
'87a3e934062d1ad81c6d9c557afe8b94ffc6a17d']
gbp:debug: ['git', 'show-ref', 'refs/heads/master']
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'master']
gbp:info: Replacing upstream source on 'master'
gbp:debug: ['git', 'ls-tree', '-z', 'upstream/0.36.0^{tree}', '--']
gbp:debug: ['git', 'ls-tree', '-z', 'master^{tree}', '--']
gbp:debug: Using c4a8a211261fc53b556732b1b724f938060d0135 as debian/ tree
gbp:debug: ['git', 'mktree', '-z']
gbp:debug: ['git', 'commit-tree', 'e6fc6f222c9d84c3f8af093e743a220bd633d59f',
'-p', 'master^{commit}', '-p', 'upstream/0.36.0^{commit}']
gbp:debug: ['git', 'update-ref', '-m', 'gbp: Updating master after import of
upstream/0.36.0', 'refs/heads/master',
'69f13f7d26624e430f433432f35f5cf4c59392fc']
gbp:debug: ['git', 'reset', '--quiet', '--hard',
'69f13f7d26624e430f433432f35f5cf4c59392fc', '--']
gbp:debug: ['git', 'symbolic-ref', 'HEAD']
gbp:debug: ['git', 'show-ref', 'refs/heads/master']
gbp:debug: rm ['-rf', '../tmp2_xslh4t'] []
gbp:info: Successfully imported version 0.36.0 of ../guitarix_0.36.0.orig.tar.xz
root@desktop:~/guitarix# git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: debian/NEWS.Debian
typechange: debian/changelog
new file: debian/clean
modified: debian/compat
modified: debian/control
modified: debian/copyright
new file: debian/guitarix-common.install
new file: debian/guitarix-doc.doc-base
new file: debian/guitarix-doc.docs
new file: debian/guitarix-doc.lintian-overrides
new file: debian/guitarix-ladspa.install
new file: debian/guitarix-lv2.install
new file: debian/guitarix.1
new file: debian/guitarix.dirs
new file: debian/guitarix.install
new file: debian/guitarix.manpages
new file: debian/gxw-glade.install
new file: debian/libgxw-dev.install
new file: debian/libgxw0.install
new file: debian/libgxw0.lintian-overrides
new file: debian/libgxwmm-dev.install
new file: debian/libgxwmm0.install
new file: debian/libgxwmm0.lintian-overrides
new file: debian/patches/02-libdl.patch
new file: debian/patches/series
modified: debian/rules
deleted: guitarix.desktop.in
deleted: waf
deleted: wscript
deleted: wscript_dsp.py
deleted: wscript_helper.py
root@desktop:~/guitarix#
