Caleb Epstein <caleb.epstein@gmail.com> writes:
But CVS is just as bad if not worse in this regard, unless you lay down tags everywhere. Or if you use CVSNT, which is the only open-source tool I've encountered that supports history sensitive merging.
As large projects are finding out (gcc, Mono), having tons of branches and tags slows down CVS a great deal after a while. Merging is not history sensitive in SVN nor is it in CVS, so you must follow best practices to be able to merge to/from a branch more than once successfully. In CVS this means tagging like a maniac, and in SVN its a simple matter of leaving an explicit comment about your merge point when you do merge code.
Or you can use svnmerge. If it works as advertised, I'd like to have a project policy that we do so. -- Dave Abrahams Boost Consulting www.boost-consulting.com