On Wed, Mar 14, 2018 at 10:29:18AM +0100, Sébastien Villemot wrote:
> 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)
Or you could just use the --no-rollback option, and complete the merge
manually (probably you'll just need to issue a bunch of `git checkout
--theirs` followed by the `git commit` to complete the merge).
This kind of things usually happen when you commit changes to upstream
files in the packaging branch.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
Attachment:
signature.asc
Description: PGP signature