Dear all, I want to package an upstream snapshot from a git repository, however I get errors importing with Basically first I download the directory from upstream git repository, and renamed to package~git20161017 and then compress it as package~git20161017.orig.tar.gz I take this new tarball to use the tool (under collab-maint git repo): gbp import-orig --verbose --pristine-tar /path/to/tarball/package~git20161017.orig.tar.gz
But I get an error merging with the master branch: $ gbp import-orig --verbose --pristine-tar /home/elias/devel/gpick/gpick_0.2.5~git20161017.orig.tar.gz gbp:debug: ['git', 'rev-parse', '--show-cdup'] gbp:debug: ['git', 'rev-parse', '--is-bare-repository'] gbp:debug: ['git', 'for-each-ref', '--format=%(refname:short)', 'refs/heads/'] gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] gbp:debug: ['git', 'status', '--porcelain'] What is the upstream version? [0.2.5~git20161017] gbp:debug: ['git', 'tag', '-l', 'upstream/0.2.5_git20161017'] gbp:debug: tar ['-C', '../tmptYqlLL', '-a', '-xf', '/home/elias/devel/gpick/gpick_0.2.5~git20161017.orig.tar.gz'] [] gbp:debug: Unpacked '/home/elias/devel/gpick/gpick_0.2.5~git20161017.orig.tar.gz' to '../tmptYqlLL/gpick_0.2.5~git20161017' gbp:info: Importing '/home/elias/devel/gpick/gpick_0.2.5~git20161017.orig.tar.gz' to branch 'upstream'... gbp:info: Source package is gpick gbp:info: Upstream version is 0.2.5~git20161017 gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] gbp:debug: ['git', 'add', '-f', '.'] gbp:debug: ['git', 'write-tree'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] gbp:debug: ['git', 'commit-tree', 'd2ffad3d57a44a2d31da4d268a5a3dfd787ca630', '-p', '4b7087b6ddf4f064f886abdaea8130cb1f68b744'] gbp:debug: ['git', 'update-ref', 'refs/heads/upstream', 'a16d357857b8229f228fed6ad87c7ab58809f2e6', '4b7087b6ddf4f064f886abdaea8130cb1f68b744'] gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'pristine-tar'] gbp:debug: ['git', 'ls-tree', '-z', 'upstream', '--'] gbp:debug: ['git', 'mktree', '-z'] gbp:debug: /usr/bin/pristine-tar [] ['commit', '/home/elias/devel/gpick/gpick_0.2.5~git20161017.orig.tar.gz', 'd2ffad3d57a44a2d31da4d268a5a3dfd787ca630'] gbp:debug: ['git', 'tag', '-m', 'Upstream version 0.2.5~git20161017', 'upstream/0.2.5_git20161017', 'a16d357857b8229f228fed6ad87c7ab58809f2e6'] gbp:debug: ['git', 'show-ref', 'refs/heads/master'] gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'master'] gbp:info: Merging to 'master' gbp:debug: ['git', 'symbolic-ref', 'HEAD'] gbp:debug: ['git', 'show-ref', 'refs/heads/master'] gbp:debug: ['git', 'symbolic-ref', 'HEAD'] gbp:debug: ['git', 'show-ref', 'refs/heads/master'] gbp:debug: ['git', 'help', 'merge', '-m'] gbp:debug: ['git', 'merge', '--no-summary', '--no-edit', 'upstream/0.2.5_git20161017'] gbp:error: Automatic merge failed. gbp:error: Error detected, Will roll back changes. gbp:info: Rolling back branch upstream by resetting it to 4b7087b6ddf4f064f886abdaea8130cb1f68b744 gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of upstream', 'refs/heads/upstream', '4b7087b6ddf4f064f886abdaea8130cb1f68b744'] gbp:info: Rolling back branch pristine-tar by resetting it to 14cb9c869b865dd1fb3093593ed8d106d5d2dd67 gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of pristine-tar', 'refs/heads/pristine-tar', '14cb9c869b865dd1fb3093593ed8d106d5d2dd67'] gbp:info: Rolling back tag upstream/0.2.5_git20161017 by deleting it gbp:debug: ['git', 'tag', '-l', 'upstream/0.2.5_git20161017'] gbp:debug: ['git', 'tag', '-d', 'upstream/0.2.5_git20161017'] gbp:info: Rolling back branch master by resetting it to fa16c335847412ab4f29869f88d9a6214a234baf gbp:debug: ['git', 'update-ref', '-m', 'gbp import-orig: failure rollback of master', 'refs/heads/master', 'fa16c335847412ab4f29869f88d9a6214a234baf'] gbp:info: Rolling back failed merge of upstream/0.2.5_git20161017 gbp:debug: ['git', 'merge', '--abort'] gbp:error: Rolled back changes after import error. gbp:debug: rm ['-rf', '../tmptYqlLL'] [] Another question: What's the difference between package~git20161017.orig.tar.gz and package+git20161017.orig.tar.gz because I've seen packages with these kind of names. I've also made this change but I still get the same error. Regards, Elías Alejandro