On Wed, Mar 14, 2018 at 07:13:31AM +0100, Daniel Stender wrote:
> I've problems with importing the upstream tarball into the repo of Bcolz:
>
> <cut>
> $ uscan --no-conf --verbose --download --force-download --destdir ../ --rename --repack --compression xz
> {...}
> $ gbp import-orig ../bcolz_1.1.2+ds1.orig.tar.xz
> What is the upstream version? [1.1.2+ds1]
> gbp:info: Importing '../bcolz_1.1.2+ds1.orig.tar.xz' to branch 'upstream' (filtering out ['.gitignore'])...
> gbp:info: Source package is bcolz
> gbp:info: Upstream version is 1.1.2+ds1
> gbp:info: Merging to 'debian/master'
> gbp:error: Automatic merge failed.
> gbp:error: Error detected, Will roll back changes.
> gbp:info: Rolling back branch upstream by resetting it to 8cacdf572b1bf20b1c2b37bc60af4db142ca9f24
> gbp:info: Rolling back branch pristine-tar by resetting it to c940849f7c81d4de8fdf02255dfcdb9fe9c9e188
> gbp:info: Rolling back tag upstream/1.1.2+ds1 by deleting it
> gbp:info: Rolling back branch debian/master by resetting it to 241aa4d7c3d822473dfb38b55e6d2386b76fa083
> gbp:info: Rolling back failed merge of upstream/1.1.2+ds1
> gbp:error: Rolled back changes after import error.
> </cut>
>
> Can anybody figure out what's going wrong here?
The problem comes from the file bcolz/version.py that is present in the
upstream branch and tarball, but not in the debian/master branch.
You should first resurrect this file on the debian/master branch, then retry
gbp import-orig.
(I figured this out by using the --no-rollback option of gbp import-orig, which
leaves the repo in the unmerged state)
--
⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot
⣾⠁⢠⠒⠀⣿⡁ Debian Developer
⢿⡄⠘⠷⠚⠋⠀ http://sebastien.villemot.name
⠈⠳⣄⠀⠀⠀⠀ http://www.debian.org
Attachment:
signature.asc
Description: PGP signature