Subversion has been around for a while now and there are some very reliably maintained Windows clients, most notably Tortoise SVN. Unfortunately the same can not be said for OSX. There is one client that seems to stand out quite a bit from the others, Versions. Keep in mind that Versions is not free like Tortoise SVN but so far it has proven to be well worth the money.
Versions is a great tool but one of things it lacks is integration into one of my preferred diff/merge tools KDiff. Thankfully the developers of Versions have exposed hooks to allow people to write scripts which will allow users to integrate their preferred diff/merge application. I’ll show you how I was able to do that and how you can integrate your preferred application.
The key steps to get your diff script to work…
- Copy your script to the folder “~/Library/Application Support/Versions/Compare Scripts”
- In Versions preferences in the file comparison drop down select your compare script
That’s it you should be set to go. Here’s a screenshot of how kDiff is integrated in my preferences screen.