> From: vanderwalt.dev...@columbus.co.za > [mailto:vanderwalt.dev...@columbus.co.za] > Sent: Tuesday, November 19, 2013 1:47 AM > To: Ben Reser > Cc: Chris Shelton; Nico Kadel-Garcia; Subversion; bob.arc...@amsi.com; Andrew > Reedick > Subject: Re: Looking into using Subversion > > Thank you all, Chris Bob, Andrew, Ben. > > Bob, the Server I am taking about here is our development, not > production server so it will be fine. > > Chris, Andrew, and Ben thank you for given me 3 solutions to explore. > > I think I am going to give Subversion try, only thing I am not too keen > about is the command line interface. Our developers here would > prefer a GUI client, any good ones you can suggest?
The important thing is to use a 1.8.x client for the improved merging, i.e. not having to use the --reintegrate switch with 'svn merge' anymore. TorstiseSVN on Windows is great. Subclipse supports 1.8.x and works. However, last I checked, NetBeans requires you to set the subversion plugin to use the 1.8.x CLI instead of javahl or svnkit (which are limited to 1.7.) Again, last I checked, non-windows GUI clients also have the problem of being stuck at 1.7.x.