On Mon, Apr 23, 2018 at 08:00:03AM +0000, Eugene Zhukov wrote: > Package: git-buildpackage > Version: 0.9.8 > Severity: normal > > Dear Maintainer, > > I was trying to update TestNG package to the latest upstream release, but gbp > import-orig fails without much useful (for me) output. > > Here is how to reproduce the problem: > > eugene@debian:~/dev$ git clone ssh://git.debian.org/git/pkg-java/testng.git > Cloning into 'testng'... > remote: Counting objects: 32552, done. > remote: Compressing objects: 100% (10926/10926), done. > remote: Total 32552 (delta 19512), reused 32540 (delta 19509) > Receiving objects: 100% (32552/32552), 22.93 MiB | 2.35 MiB/s, done. > Resolving deltas: 100% (19512/19512), done. > eugene@debian:~/dev$ cd testng/ > eugene@debian:~/dev/testng$ git checkout upstream > Branch 'upstream' set up to track remote branch 'upstream' from 'origin'. > Switched to a new branch 'upstream' > eugene@debian:~/dev/testng$ git checkout master > Switched to branch 'master' > Your branch is up to date with 'origin/master'. > eugene@debian:~/dev/testng$ gbp import-orig --uscan --verbose > 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', '--verify', 'refs/heads/upstream'] > gbp:debug: ['git', 'status', '--porcelain'] > gbp:info: Launching uscan... > uscan: Newest version of testng on remote site is 6.14.3, local version is > 6.9.12 > uscan: => Newer package available from > https://github.com/cbeust/testng/archive/6.14.3.tar.gz > gbp:info: Using uscan downloaded tarball ../testng_6.14.3.orig.tar.gz > What is the upstream version? [6.14.3] > gbp:debug: ['git', 'tag', '-l', 'upstream/6.14.3'] > gbp:debug: tar ['-C', '../tmp7udar6lx', '-a', '-xf', > '../testng_6.14.3.orig.tar.gz'] [] > gbp:debug: Unpacked '../testng_6.14.3.orig.tar.gz' to > '../tmp7udar6lx/testng-6.14.3' > gbp:info: Importing '../testng_6.14.3.orig.tar.gz' to branch 'upstream'... > gbp:info: Source package is testng > gbp:info: Upstream version is 6.14.3 > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'testng-6.14.3^{}'] > gbp:error: Import of ../testng_6.14.3.orig.tar.gz failed: revision > 'testng-6.14.3^{}' not found > gbp:debug: rm ['-rf', '../tmp7udar6lx'] [] > eugene@debian:~/dev/testng$
The issue is that debian/gbp.conf has upstream-vcs-tag set which means that import-orig should use that tag as an additional parent however this tag is not present in your repo. If you want to continue to use --vcs-tag option then you need to fetch upstream's git repo too. If you don't need that functionality comment out the vcs-tag option in gbp.conf. I'll add a better error message with the next upload. Cheers, -- Guido
