On Tue, Jun 12, 2012 at 04:13:10PM -0500, Glenn Holmer wrote: > We upgraded from 1.5 to 1.6 fairly recently, and had a lot of pain with > merges in 1.5; we're still a little skittish about it.
I'd recommend 1.7 instead of 1.6, especially for the client-side. There are some nice-to-have merge-tracking enhancements in 1.7: http://subversion.apache.org/docs/release-notes/1.7.html#merge-tracking-enhancements
