Dear Wiki user, You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change notification.
The "ListOfDiffApplications" page has been changed by GabrielaGibson: http://wiki.apache.org/subversion/ListOfDiffApplications?action=diff&rev1=4&rev2=5 http://svnx.googlecode.com/svn-history/r137/trunk/Resources/svndiff.sh - ----------- + =========================================================================================== TextWrangler (Mac) @@ -200, +200 @@ 03/25/2013 Bare Bones Software, Inc. TWDIFF(1) - ----------- + =========================================================================================== BBEdit (Mac) @@ -212, +212 @@ bbdiff [ --<options> ] [ OLDFILE NEWFILE | OLDFOLDER NEWFOLDER] - ----------- + + =========================================================================================== Araxis Windows (OS X) @@ -250, +251 @@ araxissvndiff3 [-? | -h] <mineTitle> <olderTitle> <yoursTitle> <mineFile> <olderFile> <yoursFile> - To use araxissvndiff3 with the Subversion command-line tools, edit your ~/.subversion/config so that the diff3-cmd property in the [helpers] section references araxissvndiff3. For example: + To use araxissvndiff3 with the Subversion command-line tools, edit your + ~/.subversion/config so that the diff3-cmd property in the [helpers] section + references araxissvndiff3. For example: diff3-cmd = /Applications/Araxis\ Merge/Utilities/araxissvndiff3 - This line is commented-out in the default configuration file, so you should remove the # character and space at the start if present. + This line is commented-out in the default configuration file, so you should + remove the # character and space at the start if present. - ----------- + =========================================================================================== DiffMerge (Windows, Mac OS X, and Linux) @@ -267, +271 @@ diffmerge [options] [pathname1 [pathname2 [pathname3]]] Man page: https://github.com/bagilevi/homefiles/blob/master/bin/diffmerge.man1 - other info that may be useful (or not): + other info that may be useful: Uses TortoiseSVN and it looks like that is the only option -- nothing else is mentioned in the DiffMerge manual -- it points here: @@ -293, +297 @@ diffmerge tool itself. - ----------- + =========================================================================================== TortoiseSVN Graphical Client, see DiffMerge - ---------- + + =========================================================================================== Rhapdosy (Windows) @@ -308, +313 @@ http://www.ibm.com/developerworks/wikis/download/attachments/121930141/Using_Rhapsody_with_Subversion1.pdf uses Diffmerge: - For each of the file types added to the Advanced list found within the Diff Viewer pane, add the following to the + For each of the file types added to the Advanced list found within the Diff - External Program field: + Viewer pane, add the following to the External Program field: <Path to Rhapsody Install>\DiffMerge.exe -xcompare -base %base %theirs %mine - For each of the file types added to the Advanced list found within the Merge Tool pane, add the following to the + For each of the file types added to the Advanced list found within the Merge - External Program field: + Tool pane, add the following to the External Program field: <Path to Rhapsody Install>\DiffMerge.exe -xmerge -base %base %theirs %mine -out %merged - ---------- + + =========================================================================================== KDiff3 (Linux) @@ -348, +354 @@ http://stackoverflow.com/questions/4803881/how-to-set-kdiff3-as-merge-tool-for-svn - Somewhat confused now: - "Although there is a problem with kdiff3 which does not support 4 plain arguments (the svn passes 4 plain arguments to kdiff3, and it does not work), so it is usually called with a simple script to @@ -361, +365 @@ kdiff3 dev discussion of the above: http://kde.6490.n7.nabble.com/KDiff3-subversion-support-as-merge-tool-cmd-td1446860.html - ---------- + + =========================================================================================== - MacVim Mac + MacVim (Mac) commandline helper for Vim style editors @@ -373, +378 @@ (Note, this diff works 4 files?) - ----------- + =========================================================================================== - FileMerge + FileMerge (Mac) Graphical Client @@ -410, +415 @@ -ancestor "$ancestorfile" -merge "$mergefile" - ----------- + =========================================================================================== - Kaleidoscope Mac + Kaleidoscope (Mac) Graphical client @@ -488, +493 @@ implies --no-wait FILE [...] the files to diff - ----------- + + =========================================================================================== - p4Merge windows/unix/mac/linux + p4Merge (windows/unix/mac/linux) Graphical client @@ -523, +529 @@ diff-cmd = /home/matt/bin/diffwrap.sh - ----------- + =========================================================================================== Meld (Linux, Os X, Windows) @@ -551, +557 @@ $svn diff MyFile.txt --diff-cmd meld - ----------- + =========================================================================================== - Guiffy windows/Mac/Linux + Guiffy (windows/Mac/Linux) Graphical client @@ -592, +598 @@ Could not locate a man page, emailed support. - ----------- + =========================================================================================== - Roaring Diff Mac + Roaring Diff (Mac) Graphical client @@ -603, +609 @@ You can point svn to RoaringDiff manually every time you run svn diff: $ svn diff --diff-cmd /Applications/RoaringDiff.app/Contents/MacOS/RoaringDiff - This becomes tedious quickly. If you plan to use RoaringDiff for most of your diffing, edit ~/.subversion/config and change diff-cmd in that file: + This becomes tedious quickly. If you plan to use RoaringDiff for most of your + diffing, edit ~/.subversion/config and change diff-cmd in that file: ### Set diff-cmd to the absolute path of your 'diff' program. ### This will override the compile-time default, which is to use @@ -614, +621 @@ $ svn diff --diff-cmd diff + =========================================================================================== + tkdiff (linux) - ----------- - - tkdiff Graphical client @@ -627, +633 @@ tkdiff <file1> <file2> to compare two files. - tkdiff -conflict <file> to merge a file with conflict markers generated by "merge" or "cvs", The file is split into two temporary files which you can then merge as usual. + tkdiff -conflict <file> to merge a file with conflict markers generated by + "merge" or "cvs", The file is split into two temporary files which you can + then merge as usual. - tkdiff <file> to compare <file> with the most recent version checked into CVS/SCCS/RCS (checked for in that order). + tkdiff <file> to compare <file> with the most recent version checked into + CVS/SCCS/RCS (checked for in that order). tkdiff -r <file> to compare <file> with the most recent version checked in. tkdiff -r<rev> <file> to compare <file> with revision <rev> of <file>. - tkdiff -r<rev> -r <file> to compare revision <rev> of <file> with the most recent version checked in. + tkdiff -r<rev> -r <file> to compare revision <rev> of <file> with the most + recent version checked in. tkdiff -r<rev1> -r<rev2> <file> to compare revisions <rev1> and <rev2> of <file>. @@ -671, +681 @@ exit $RC - ----------- + =========================================================================================== DiffFork (Mac) @@ -679, +689 @@ From the manual, http://www.dotfork.com/difffork/tutorial/ - Create a Python shell script svndfdiff.py with the following content (replace FULLPATH with your full difffork path): + Create a Python shell script svndfdiff.py with the following content (replace + FULLPATH with your full difffork path): #!/usr/bin/env python import sys @@ -707, +718 @@ svn diff --diff-cmd svndfdiff.py + =========================================================================================== - - ----------- BeyondCompare (Windows, Linux) @@ -770, +780 @@ Edit "$HOME/.subversion/config" and add the line "merge-tool-cmd = /usr/bin/bcmerge.sh" - ----------- + =========================================================================================== WinMerge (Windows) @@ -785, +795 @@ svn diff --diff-cmd wm [optional-filename] - ----------- + =========================================================================================== Colordiff (Linux) perl script for command line, to colorize output.
