Is there a better tool for performing merges in SVN (capable of using merge tracking info)?
From other questions I gather that the strength of the DVCS, the ease of me开发者_如何学Crges, comes from the fact that each revision knows its parents. Ever since SVN 1.5 came out over 2 years ago, this is also available for SVN. So is there some tool which can use this information and make merges as easy in SVN as it is in DVCS?
I'm using p4merge http://www.perforce.com/perforce/products/merge.html
精彩评论