On 2008-06-27 at 17:52 +0100, Nicholas Clark wrote: > means that you can't cope with merging a routine set of operations, and I > have to force-bodge something? Painfully. Sideways. It's so tempting.
svn's merging has been bad; allegedly the recently released 1.5.x series fixes that, once you do "svnadmin upgrade ..." to get some more server-side state tracking. http://subversion.tigris.org/svn_1.5_releasenotes.html I'm sticking with 1.4 until 1.5.x has something where x != 0. No reason particular to svn, just my normal habit. -Phil