I want tkdiff (or something like it) to display my 'svn diff' so that I can switch files in the tkdiff interface itself.
(I'm using a mac.)
A:
It is somewhat convoluted and involves writing a wrapper script to emulate the diff and diff3 tools
Here is more info about it.
Peter Tillemans
2010-09-22 17:20:15
+5
A:
The easiest way is to use an SVN client. It will enable additional functionality not available with command line SVN.
On Windows, I recommend TortoiseSVN. It allows integration with third party diff tools such as Araxis Merge.
Similar tools exist on other operating systems which allow you to do the same.
Andres
2010-09-22 17:30:32
Yep, TortoiseSVN for windows. And for linux you have Kompare and KDiff3.
Stefan Monov
2010-09-22 17:32:08
A list just for OS X: http://theappleblog.com/2009/02/23/12-subversion-apps-for-os-x/
Michael Brewer-Davis
2010-09-24 21:50:56
A:
One windows I use TortoiseSVN, best SCM client on the planet.
On Linux the closest I can get is installing meld and running the following subversion command:
svn diff MyFile.txt --diff-cmd meld
Mark O'Connor
2010-09-24 18:50:46
A:
TortoiseSVN as many already have mentioned. It has a built in text file comparison app callled TortoiseMerge. But a more pretty text file compare tool is WinMerge, which if you install can integrate with TortoiseSVN. It's great even for non-SVN related file comparisons.
JohnB
2010-09-24 18:54:50