camel-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Willem Jiang <willem.ji...@gmail.com>
Subject Re: Question regarding tooling while doing "svn merge"
Date Wed, 08 Feb 2012 12:41:16 GMT
Hi Babak,

svnmerge.py will set the svn properties with merged and blocked 
reversion which can help us to trace if there is any patch which we 
don't merged.
I'm not sure if the Eclipse merge tool can do the same thing.

On Wed Feb  8 19:03:29 2012, Babak Vahdat wrote:
> Hi,
>
> I make use of the following tool inside Eclipse to merge my revisions back
> to the branches:
>
> http://desktop-eclipse.open.collab.net/servlets/ProjectProcess?pageID=MEuUjb&freeformpage=Merge%20Client
>
> Are all O.K. with this or do you want me to make use of the Python script
> mentioned here:
>
> http://camel.apache.org/merging-commits-from-trunk-to-fixes-branch.html
>
> Babak
>
> --
> View this message in context: http://camel.465427.n5.nabble.com/Question-regarding-tooling-while-doing-svn-merge-tp5466224p5466224.html
> Sent from the Camel Development mailing list archive at Nabble.com.
>



-- 
Willem
----------------------------------
FuseSource
Web: http://www.fusesource.com
Blog:    http://willemjiang.blogspot.com (English)
         http://jnn.javaeye.com (Chinese)
Twitter: willemjiang 
Weibo: willemjiang 


Mime
View raw message