[pkg-bacula-devel] Contribution

[Mario Pranjic]

On 10/1/20 12:34 AM, Carsten Leonhardt wrote:
> After having read a recent discussion on the debian-devel list, I'd
> start with putting the clean upstream sources into branch
> "upstream/latest", branch off "debian/latest" from there and add Debian
> specifics there (i.e. the debian/ subdirectory).
>
> Details are here, not yet updated after the recent discussion though:
>
> https://dep-team.pages.debian.net/deps/dep14/
>
> (Out of respect to people who feel that "master" is not a good word to
> use, it will probably be replaced it with "latest" or "sid" in that draft)
>
>
> This command might do all that work (I haven't used that yet for an initial import):
>
> gbp import-orig --upstream-branch=upstream/latest --debian-branch=debian/latest --pristine-tar <tarball>
>
Hi,

I created two new branches (*upstream/latest* and *debian/latest*) and 
are trying to run import-orig as described:

mario at backup-dev:~/repos/bacula-libs3$ *gbp import-orig 
--upstream-branch=upstream/latest --debian-branch=debian/latest 
--pristine-tar libs3-20200523.tar.gz *
What will be the source package name? [libs3]
What is the upstream version? [20200523]
gbp:info: Importing 'libs3-20200523.tar.gz' to branch 'upstream/latest'...
gbp:info: Source package is libs3
gbp:info: Upstream version is 20200523
gbp:info: Merging to 'debian/latest'
gbp:error: Automatic merge failed.
gbp:error: Error detected, Will roll back changes.
gbp:info: Rolling back branch upstream/latest by resetting it to 
ff2ae198f54a2b9af16b893c700a2bda98caf315
gbp:info: Rolling back branch 'pristine-tar' by deleting it
gbp:info: Rolling back tag 'upstream/20200523' by deleting it
gbp:info: Rolling back branch debian/latest by resetting it to 
668b9a555153e531d4591079dddecac43a327150
gbp:info: Rolling back failed merge of upstream/20200523
gbp:error: Rolled back changes after import error.

Getting error I have trouble understanding what is actually failing. 
Could use some help here. :)

Thanks in advance!

Best regards,

Mario.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-bacula-devel/attachments/20201130/c306fa4d/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/pkg-bacula-devel/attachments/20201130/c306fa4d/attachment.sig>