Re: Merging from trunk to branches

2013-02-18 Thread Bilgin Ibryam
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 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

Re: Merging from trunk to branches

2013-02-17 Thread Willem jiang
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