ruby, rails, textmate, automation, etc.

Easy git-svn for Rails (or "git-me-up")

Posted on April 24, 2008

I’ve been trying to persuade git-svn to work properly with Rails plugins that have been installed via svn:externals. Whilst working out how to do it I stumbled across several great articles, but I couldn’t get any of the solutions presented to work perfectly. Samuel Tesla’s article is especially informative, but for a long time I couldn’t stop git-svn from trying to commit Git metadata back into my Subversion repository…

After a bit of head scratching I got it sorted, and wrapped the process up in a little utility called git-me-up.

The incredible merging power of Git

Posted on April 16, 2008

When I setup this blog I took the opportunity to try out Git. The thinking was that if I needed to patch the blog software (Mephisto) that I’d have a fairly trouble free upgrade path, merging the upstream changes straight into my branch.

And then, several hours of work later, I lost everything…