[pkg-bacula-devel] Contribution

[Sven Hartge]

Please don't Cc: me on mails to this list.

On 30.11.2020 20:50, Mario Pranjic wrote:

> 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.

Don't create the branches, don't have the tar in the same directory and 
it will work.

oweh at skuld:/tmp$ git init bacula-libs3
Initialized empty Git repository in /tmp/bacula-libs3/.git/
oweh at skuld:/tmp$ cd bacula-libs3/
oweh at skuld:/tmp/bacula-libs3 (master #)$ gbp import-orig 
--upstream-branch=upstream/latest --debian-branch=debian/latest 
--pristine-tar --filter=debian/* ../libs3-20200523.tar.gz
What will be the source package name? [libs3] bacula-libs3
What is the upstream version? [20200523] 20200523
gbp:info: Importing '../libs3-20200523.tar.gz' to branch 
'upstream/latest' (filtering out ['debian/*'])...
gbp:info: Source package is bacula-libs3
gbp:info: Upstream version is 20200523
gbp:info: Successfully imported version 20200523 of 
../bacula-libs3_20200523.orig.tar.gz
oweh at skuld:/tmp/bacula-libs3 (debian/latest)$ ls
archlinux  ChangeLog  COPYING  doxyfile  GNUmakefile  GNUmakefile.mingw  
GNUmakefile.osx  inc  INSTALL  libs3.spec  LICENSE  mswin  README  src  
test  TODO
oweh at skuld:/tmp/bacula-libs3 (debian/latest)$ git branch -a
* debian/latest
   pristine-tar
   upstream/latest

Grüße,
Sven.