Visual SVN diff and compare tools for Linux

Question

Which is the best Visual SVN Diff displayer for Linux.

BeyondCompare and VisualSVN 1.5 work well on Windows. What are the equivalent tools for Linux? (Specifically Ubuntu).

I know command line diff works; But I'd like multiple column syntax highlighted and differences.

Better if the tool has a support for Git and Hg as well.

Solution 1

Note: If your diff tool has a CLI (a command line interface), it can be integrated with Git quite easily, both for diff and merge (if it supports 3-way merges).
Since Git1.6.3, the difftool - mergetool options allow you to integrate that diff program (see "How do I view 'git diff' output with visual diff program?").

KDiff3 for instance is a good candidate for that, since it is even auto-detected by Git.

Solution 2

I have been using meld for this purpose, in Ubuntu you can just do:

apt-get install meld

I think it only does two-way compare, but usually that is only what you need, and only what the diff shows you anyway.

When you get a conflict using SVN and have to do a merge, you usually get 4 files AFAIR.

• file.mine - The file with your local changes as before svn update.
• file.r<n> - The revision on which you created your local changes.
• file.r<n+m> - The revision you updated to from svn, usually HEAD.
• file - Subversions attempt at merging your changes into the updated file.

So to use meld to merge your changes in, you would do:

meld file.mine file.<n+m>

And merge either your changes into the revision updated from svn, or the other way around. It is usually easier to merge the file with the fewest changes to the file with most changes.

And last you would override file with the merged file and do a:

svn resolved file

Solution 3

Diffuse supports Subversion, Mercurial, Git, and several other version control systems. It works on Windows too. For Ubuntu, just install the .deb package with "$ sudo dpkg -i diffuse-*.deb" and then run "diffuse -m" to view your changes or fix merge conflicts.

Solution 4

Beyond Compare supports Linux as well. If you already like BC for Windows, I'd say go with a winner.

Solution 5

KDiff3 is very good (I also use it on windows). It works for both compare and merge.

View more solutions

Comments

[Stephan202]

Not specific to versioning, but this page lists a lot of diff tools (be sure to check the comments): amjith.blogspot.com/2007/07/visual-diff-tools-in-linux.html

[lprsd]

Sourceforge repo page says "0" downloads

[Admin]

"0 downloads" is a SourceForge statistics server hiccup.

[Eugene M]

I believe meld has support for 3-way merging now.

[Bjarke Freund-Hansen]

Was introduced to Beyond Compare through work recently, and I must say that is a clear winner. Really useful tool.

[Jeff]

Hi, if you're going to advertise your own software please make that explicit in the text of your answer