Hi,
On Tue, Nov 14, 2017 at 08:00:42PM +0100, Víctor Cuadrado Juan wrote:
> 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.
> 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
This all looks fine so I don't see a bug here.
> 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
This wired and I wouldn't expect uncommitted changes but since I don't
know about your setup and what you're doing (the upstream repo
e.g. already has the version you're trying to import) you'd have to
provide better instructions to reproduce and tell me what you actually
think is wrong. Can you reproduce this with other packages?
I'm clined to close this as is since the gbp output above looks normal.
Cheers,
-- Guido
> root@desktop:~/guitarix#
