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

2016-12-02 Thread Andrey Rahmatullin
On Fri, Dec 02, 2016 at 09:08:51AM +0100, Olivier Sallou 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

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 Andrey Rahmatullin
On Thu, Dec 01, 2016 at 04:36:09PM +0100, Andreas Tille wrote: > I tried to apply your hint to ncbi-tools6[1] but this does not change > anything: > > ncbi-tools6(master) $ LC_ALL=C git merge upstream/6.1.20120620 > Already up-to-date. > > Did I missinterpreted your hint? No, but you could check

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

2016-12-01 Thread Andrey Rahmatullin
On Thu, Dec 01, 2016 at 04:35:01PM +0100, gregor herrmann 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.

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

2016-12-01 Thread gregor herrmann
On Thu, 01 Dec 2016 19:21:32 +0500, Andrey Rahmatullin wrote: > > forwarding issue to debian-mentors > 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.

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

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

2016-12-01 Thread Andrey Rahmatullin
On Thu, Dec 01, 2016 at 03:15:00PM +0100, Andreas Tille wrote: > Hi, > > forwarding issue to debian-mentors 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.

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