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?
Wow, has it really been over 2 months since I’ve posted? Shameful. As most of you know, I’ve moved to Stockholm, Sweden. I’ve been here for about a month now, and it’s been wonderful so far.
The biggest surprise has been how excellent the summer climate is. Typical is 72 and partly sunny during the day, dropping to about 60 in the evening. This is perfect weather. Los Angeles weather. Of course, that’s all over…it’s now decidedly autumn.
Overall, though, it hasn’t taken me too long to feel “at home” here. Or closer to it than I expected anyway. Occasionally I have to remind myself that I’m living in a foreign country. I thought I’d still feel like a tourist at this point, and yet it’s still kinda like I’m on vacation.
That seems silly to say, but really, nearly everyone speaks English here. While this has kept away the feeling of isolation, it has contributed to my greatest challenge: learning Swedish. Yeah, big surprise, right? I’m finding it rather difficult to learn. Sure, I can tell I’m getting better, albeit slowly. But dammit I’m impatient.
All right, well that’s enough blathering on about myself. I know this is a blog — self-absorbed by definition — but really…
