From: Robert L. t. G. <rh...@as...> - 2009-05-05 12:16:30
|
I think that you need to switch to 1.5 (or 1.6) before you branch to be able to use the 1.5 merge support. So "when necessary" is now. R On May 5, 2009, at 5:32 AM, swi...@li... wrote: >> Make sure you use a subversion 1.5 or higher client for when you do >> merging. This is quite important, else the merge info doesn't work >> properly as subversion underwent some big merging improvements in >> 1.5. >> Although, I can't see how to verify this, the SF svn server now >> seems to >> use version 1.5 >> (http://apps.sourceforge.net/trac/sourceforge/wiki/Subversion), so we >> can use the improved svn merging. Previously we used svnmerge.py for >> merging, but this should no longer be necessary. ... > > My svn is 1.3, but I will update it later to subversion 1.5 when > necessary. |