Subversion 1.5 will include merge tracking

Despite Linus’ strident criticism of Subversion (in the 70 minute video he accuses Subversion, and then anybody who wrote it, and then anybody who likes it, of being ugly and stupid) I still use Subversion and I like it. Clearly compared to Linus I am ugly and stupid. OK fine. But I’m not switching to git now because my tiny teams have been fine with Subversion. Maybe later I’ll give git a whirl.
Continue reading “Subversion 1.5 will include merge tracking”

Ubuntu Linux 7.04 “Feisty Fawn” upgrade report

7.04 (meaning “the major release planned for 2007/04”, not meaning “the minor release following 7.03”) was released on April 19th. I upgraded today and it went pretty well, with a bit of manual cleanup required. More details after the jump. Continue reading “Ubuntu Linux 7.04 “Feisty Fawn” upgrade report”

OmniGraffle Pro and Subversion

I’m working on wireframes for a startup company, and I’m using the excellent OmniGraffle Pro to do it. Of course I’m keeping all my artifacts in Subversion. But there’s a problem: OmniGraffle sometimes changes a file’s format from a single flat file to a “bundle”, which is a directory that Mac OS X pretends is a single entity (as is seen with all the .app bundles in the /Applications directory). OmniGraffle bundles contain a file with a hideously awful filename, which I’ve seen in the old Classic MacOS if I remember correctly: Icon^M. Like, 5 characters, 5th is a carriage return. Subversion can’t check it in, svn:ignore can’t ignore it. Ugh. Here’s the fix: Using OmniGraffle with Subversion without Sadness