SVN merging is very time consuming (especially on large code bases) and error prone. Eclipse and Netbeans plugins don\'t serve me very well. At the moment I\'m using a combi
Actually there are reports of people using git-svn or hg-svn bridges to download a tree, preform a merge, then upload the merge. Doesn't solve the messiness part but the increased speed of the merge makes it less tedious.