Tools for SVN Merging

Question

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 combination of manual "svn merge" and the graphical diff Meld. Are there better alternatives (non-win32)?

Solution 1

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.

Solution 2

I have recently started using the new Beyond Compare 3 (for Windows and Linux). It seems to consistently make better automated merge decisions then TortoiseSVN or KDiff3. Particularly on whitespace, I believe this is due to BC3s better file type configuration.

I also think its merge interface is cleaner and easier to understand then KDiff.

Solution 3

Meld is arguably one of the best and one of the most used tools for non-win32. On Windows or with Wine WinMerge wins hands down. Some alternatives for Linux:

• Kompare
• KDiff3
• DirDiff

P.S. Actually on Windows the TortoiseSVN merge tool gives great results too :)

Solution 4

I figured out how to use SvnMerge, which is a Python script(s), and had quite a lot of success with it. You can google for the instructions I put on my blog, or drop me a line and I'll post the vanity link.

Solution 5

I really like Sourcegear Diffmerge. http://www.sourcegear.com/diffmerge/

View more solutions

Comments

[Igor Brejc]

Unfortunately WinMerge does not support three-way merges.

[slf]

@IgorBrejc because of this I use p4 when I'm on win perforce.com/product/components/…

[Nate Zaugg]

KDiff3 runs on Windows, supports 3-way merge and is the most competent free merge tool out there.