Skip to main content

Posts

Showing posts from September, 2011

Git-SVN Mirror without the annoying update-ref

This post is part of a series on Git and Subversion. To see all the related posts, screencasts and other resources, please click here

So no sooner than I had done my git-svn presentation at JavaZone, I got word of a slightly different Git-SVN mirror setup that makes it a bit easier to work with:

In short, my old recipe includes an annoying git update-ref step to keep the git-svn remote reference up to date with the central bare git repo. This new recipe avoids this, so we can simply use git svn dcommit  directly.

So, longer version, with the details. My original recipe is laid out in five steps:

Clone a fresh Git repo from Subversion. This will be our fetching repo.Set up a bare repo.Configure pushing from the fetching repo to bare repoIn the shoes of a developer, clone the repoSet up an SVN remote in the developer's repo In the new approach, we redefine those last two steps:
(See the original post for how to do the first three.)
4. Clone the bare repo

Note the -o parameter that sp…

My JavZone git+svn talk is online

This post is part of a series on Git and Subversion. To see all the related posts, screencasts and other resources, please click here


Update: I've also shared my notes from the talk. Here they are.

So, the Cisco/JavaZone folks were lightning fast and uploaded the recording of my session at JavaZone the day after I held it. Here it is:

Living with Git and Subversion in Parallel from JavaZone on Vimeo.
You'll have to watch it fullscreen and in HD to follow the command line action, I reckon.

I think this marks the climax, and probably the end of my adventures with git+svn. I mean, we're still using it at work, and I'll still help people with it when they ask on the "Git for human beings" mailing list. However, I won't submit it to any more conferences or user group meetings.

It's been a really interesting topic, and an important one. The resources-page has gotten 6000 views (plus a lot more on the blog posts), and the screencasts on YouTube have received…