If you’ve worked with a source code management system like subersion/cvs in Xcode, you might know that FileMerge.app is no good. It’s shiny with it’s bezier curves, but overall is wholly inadequate. It doesn’t handle line endings correctly. Here’s a way to make xcode use TextWrangler for doing diff’s.

1) Download and install TextWrangler (TW) from BareBones.
2) If you didn’t install the command line tools when you first started TW, install them by going to Preferences->Tools and click on “Install Command Line Tools”
3) Create a script file with this inside:

#!/bin/sh

echo Comparing:
echo $1
echo $2
twdiff “$1″ “$2″

4) Make sure the script is set executable (use “chmod u+x” on the command line)
5) In xcode, go to preferences->SCM select “Other” from the Vie comparisons using drop box and point it to the script.

Thursday, August 17th, 2006 @ 4:37 pm Apple, Technology
RSS 2.0 Trackback