Thanks Willem, that was it. I forgot about 2.10 branch. I will update also the docs
Bilgin On 18 February 2013 01:10, Willem jiang <willem.ji...@gmail.com> wrote: > Hi, > > When we fork the Camel-2.10.x, we changed the svn merge dependencies. > > You need to merge the patch from trunk to camel-2.10.x first. > Then you can merge the patch of camel-2.10.x to camel-2.9.x. > > > -- > Willem Jiang > > Red Hat, Inc. > FuseSource is now part of Red Hat > Web: http://www.fusesource.com | http://www.redhat.com > Blog: http://willemjiang.blogspot.com (http://willemjiang.blogspot.com/) > (English) > http://jnn.iteye.com (http://jnn.javaeye.com/) (Chinese) > Twitter: willemjiang > Weibo: 姜宁willem > > > > > > On Sunday, February 17, 2013 at 11:05 PM, Bilgin Ibryam wrote: > > > Hi, > > > > I'm trying to merge a recent commit from trunk to maintenance branches, > but > > cannot figure out what I am doing wrong. > > > > I committed to trunk: rev 1447029 > > Then in camel-2.9.x I use svnmerge.py avail but I cannot see this > revision. > > The last rev I see is 1446863 > > > > Any ideas what I am missing here? > > btw I am using mac OS and the svnmerge.py attached to [1] by Claus. I > > wonder whether that file is out of date? > > > > Thanks in advance > > Bilgin > > > > [1] > http://camel.apache.org/merging-commits-from-trunk-to-fixes-branch.html > > >
