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, 2011 at 9:29 AM, Claus Ibsen <claus.ib...@gmail.com> wrote: > 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/camel/branches/camel-2.7.x > Repository Root: https://svn.apache.org/repos/asf > > So when I run > svnmerge.py merge -r 1124595 > > It cannot merge that fix to the 2.7 branch. > > I know some of you guys are svnmerge.py experts, and maybe can check it > out. > > > -- > Claus Ibsen > ----------------- > FuseSource > Email: cib...@fusesource.com > Web: http://fusesource.com > Twitter: davsclaus, fusenews > Blog: http://davsclaus.blogspot.com/ > Author of Camel in Action: http://www.manning.com/ibsen/ > -- Cheers, Jon --------------- FuseSource Email: j...@fusesource.com Web: fusesource.com Twitter: jon_anstey Blog: http://janstey.blogspot.com Author of Camel in Action: http://manning.com/ibsen
