Re: Problems to import origtar with gbp import-orig (Was: ncbi-blast+ new upstream version git import merge error)

2016-12-02 Thread Olivier Sallou
On 12/01/2016 04:36 PM, Andreas Tille wrote: > On Thu, Dec 01, 2016 at 07:21:32PM +0500, Andrey Rahmatullin wrote: >> As there is not enough data in the message, I'm assuming it's about the >> published repo. >> The upstream/2.4.0 tag is not merged into master so the debian/2.4.0-* >> tags are

Re: Problems to import origtar with gbp import-orig (Was: ncbi-blast+ new upstream version git import merge error)

2016-12-01 Thread Andreas Tille
On Thu, Dec 01, 2016 at 07:21:32PM +0500, Andrey Rahmatullin wrote: > As there is not enough data in the message, I'm assuming it's about the > published repo. > The upstream/2.4.0 tag is not merged into master so the debian/2.4.0-* > tags are not its descendants. This will not work properly. >

Problems to import origtar with gbp import-orig (Was: ncbi-blast+ new upstream version git import merge error)

2016-12-01 Thread Andreas Tille
Hi, forwarding issue to debian-mentors On Thu, Dec 01, 2016 at 01:37:04PM +, 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

Re: ncbi-blast+ new upstream version git import merge error

2016-12-01 Thread Andreas Tille
Hi Olivier, On Thu, Dec 01, 2016 at 02:39:49PM +0100, Olivier Sallou wrote: > On 12/01/2016 02:37 PM, 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

Re: ncbi-blast+ new upstream version git import merge error

2016-12-01 Thread Olivier Sallou
On 12/01/2016 02:37 PM, 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 >

ncbi-blast+ new upstream version git import merge error

2016-12-01 Thread olivier sallou
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