Re: Merging to Camel 2.7 branch issue

2011-09-22 Thread Jon Anstey
On Thu, Sep 22, 2011 at 11:17 AM, Claus Ibsen wrote: > On Thu, Sep 22, 2011 at 3:42 PM, Daniel Kulp wrote: > > On Thursday, September 22, 2011 10:55:58 AM Jon Anstey wrote: > >> Hmm.. looks like the svnmerge metadata is messed up. First off the 2.7 > >> branch is set up to merge from the 2.8 bra

Re: Merging to Camel 2.7 branch issue

2011-09-22 Thread Claus Ibsen
On Thu, Sep 22, 2011 at 3:42 PM, Daniel Kulp wrote: > On Thursday, September 22, 2011 10:55:58 AM Jon Anstey wrote: >> Hmm.. looks like the svnmerge metadata is messed up. First off the 2.7 >> branch is set up to merge from the 2.8 branch. > > That part is correct.    Fixes flow from trunk to the

Re: Merging to Camel 2.7 branch issue

2011-09-22 Thread Jon Anstey
On Thu, Sep 22, 2011 at 11:12 AM, Daniel Kulp wrote: > On Thursday, September 22, 2011 10:55:58 AM Jon Anstey wrote: > > Hmm.. looks like the svnmerge metadata is messed up. First off the 2.7 > > branch is set up to merge from the 2.8 branch. > > That part is correct.Fixes flow from trunk to

Re: Merging to Camel 2.7 branch issue

2011-09-22 Thread Daniel Kulp
On Thursday, September 22, 2011 10:55:58 AM Jon Anstey wrote: > Hmm.. looks like the svnmerge metadata is messed up. First off the 2.7 > branch is set up to merge from the 2.8 branch. That part is correct.Fixes flow from trunk to the first branch to the next branch 2.7.x is much "c

Re: Merging to Camel 2.7 branch issue

2011-09-22 Thread Claus Ibsen
On Thu, Sep 22, 2011 at 3:25 PM, Jon Anstey wrote: > Hmm.. looks like the svnmerge metadata is messed up. First off the 2.7 > branch is set up to merge from the 2.8 branch. Next, it says all revs from > 1-1146127 are merged in - which isn't the case for sure. I've merged this > fix manually for yo

Re: Merging to Camel 2.7 branch issue

2011-09-22 Thread Jon Anstey
Hmm.. looks like the svnmerge metadata is messed up. First off the 2.7 branch is set up to merge from the 2.8 branch. Next, it says all revs from 1-1146127 are merged in - which isn't the case for sure. I've merged this fix manually for you... not sure the best way to fix this up... On Thu, Sep 22

Merging to Camel 2.7 branch issue

2011-09-22 Thread Claus Ibsen
Hi I am in need to backport CAMEL-3962 to the Camel 2.7 branch. The commit has svn rev: 1124595 But when I check the svnmerge.py avail list, then that commit number is not in that range. davsclaus:(svn)camel-2.7[camel-2.7.x:1174069]/$ svn info Path: . URL: https://svn.apache.org/repos/asf/came