forwarding issue to debian-mentors

On Thu, Dec 01, 2016 at 01:37:04PM +0000, olivier sallou wrote:
> HI,
> I have updated (locally) patches for the new release of ncbi-blast+.
> However I face an error during import of new sources in git:
> gbp import-orig --pristine-tar ../ncbi-blast+_2.5.0.orig.tar.gz
> ....
> Upstream version is 2.5.0
> Merging to 'master'
> Automatic merge failed
> Error detected, will roll back changes
> ......
> This is the first time I face this.
> How can I "force" the import of the sources? Or do you know why/how it can
> occurs?

I can confirm the very same observation in another case ncbi-tools6[1]:

$ TMPDIR=/var/tmp gbp import-orig --pristine-tar 
Make sure we use sid config
What is the upstream version? [6.1.20160908] 
gbp:info: Importing 
 to branch 'upstream'...
gbp:info: Source package is ncbi-tools6
gbp:info: Upstream version is 6.1.20160908
gbp:info: Merging to 'master'
gbp:error: Automatic merge failed.
gbp:error: Error detected, Will roll back changes.
gbp:info: Rolling back branch upstream by resetting it to 
gbp:info: Rolling back branch pristine-tar by resetting it to 
gbp:info: Rolling back tag upstream/6.1.20160908 by deleting it
gbp:info: Rolling back branch master by resetting it to 
gbp:info: Rolling back failed merge of upstream/6.1.20160908
gbp:error: Rolled back changes after import error.

Any hints?

Kind regards


[1] https://anonscm.debian.org/git/debian-med/ncbi-tools6.git

Reply via email to