Finally! I can use FileMerge with subversion
These days I pretty much always use Subversion — I have come to rely on it to save me when I manage to mangle, delete, or otherwise befoul previously working code. I have also come to rely on FileMerge, Apple’s graphical diff tool. Mmmm, shiny. Unfortunately, FileMerge doesn’t conform to the interface of the long-standard diff and diff3, so even though svn can accept external diff tools, FileMerge couldn’t be used.
I figured there was a way to overcome this problem, but my initial pokes and prods weren’t fruitful and so I abandoned my attempt. This seems to have been a good idea, because in the meantime someone else has solved the problem for me. Bruno De Fraine has posted wrapper scripts which make FileMerge svn-compatible: fmdiff, fmdiff3, and fmresolve.
By the way, I found out about fmdiff because for some reason my installation of TextMate isn’t correctly picking up my PATH variable, so it can’t see that I have subversion installed. TextMate’s documentation says that it gets its environment from the Finder.
Do any of you know how to fix this?
Comments(0)
