On Saturday, May 05, 2012 05:09:13 AM Babak Vahdat wrote: > O.K. backporting to the 2.9.x worked well, however doing the same for the > 2.8.x branch is not possible as to my understanding something on this > branch is corrupted: > > ~/dev/workspace/camel-2.8.x>svnmerge.py avail > svnmerge: Invalid path identifier '' > > Also using the -F & -i options didn't help as well.
Fixed. The last person to merge didn't resolve a conflict there so the properties were corrupt. Also, if you want, you can try my latest DoMerges script in the CXF trunk/bin. It should walk you through things fairly easily. The latest version does NOT require the svnmerge.py script. It also will work with a git clone instead of an svn co. Dan > > Babak > > > -- > View this message in context: > http://camel.465427.n5.nabble.com/About-Camel-source-which-doesn-t-build- > under-Maven-3-0-4-tp5517301p5687838.html Sent from the Camel Development > mailing list archive at Nabble.com. -- Daniel Kulp dk...@apache.org - http://dankulp.com/blog Talend Community Coder - http://coders.talend.com
