To reproduce:

cd `mktemp -d`
git clone https://salsa.debian.org/js-team/node-yarnpkg
cd node-yarnpkg
git fetch origin pristine-tar
git checkout pristine-tar
git fetch origin upstream
git checkout upstream
git checkout master
gbp import-orig --uscan --pristine-tar

at the end of the process, the master branch is screwed:
grep name package.json 
  "name": "v8-compile-cache",

the key part of the gbp import-orig is:
gbp:info: Launching uscan...
gbp:info: Using uscan downloaded tarball 
../node-yarnpkg_1.19.0.orig-v8-compile-cache.tar.gz
What is the upstream version? [1.19.0] tar: 
gbp:info: ../node-yarnpkg_1.19.0.orig.tar.gz already exists, moving to 
../node-yarnpkg_1.19.0.orig.tar.gz.1570089312
gbp:info: Importing '../node-yarnpkg_1.19.0.orig-v8-compile-cache.tar.gz' to 
branch 'upstream'...
gbp:info: Source package is node-yarnpkg
gbp:info: Upstream version is 1.19.0
gbp:info: Replacing upstream source on 'master'
gbp:info: Successfully imported version 1.19.0 of 
../node-yarnpkg_1.19.0.orig-v8-compile-cache.tar.gz

it works if I replace the last command with:

uscan 
gbp import-orig --pristine-tar ../node-yarnpkg_1.19.0.orig.tar.gz

the master branch is now OK:
grep name package.json 
  "name": "yarn",

as the salsa repo will move on, to make sure you can reproduce this later I 
have saved here:
magnet:?xt=urn:btih:4d105a0034654971cb79748a917fd474080df330&dn=node-yarnpkg.tar
 (173 MB)

a snapshot with the status after the two commands above; just download the tar 
file and extract:
tar xf node-yarnpkg.tar

P.

Reply via email to