Skip to main content

Living with Subversion and Git in parallel

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

About a month ago, I made my first attempt at introducing my team to Distributed VCS with Git. We agreed that the cost of switching away from Subversion was not a hit we would want to take right now, but we continued experimenting with Git (and Mercurial) migration on the sideline. Waiting a bit longer can't hurt, as  Git continuously gets more support in both Windows and Eclipse.

In the mean time, I wanted to learn git properly, and also get a good grasp of git-svn. We will have to live with Subversion until I can convince everyone of two things

  • git can do the atleast all things svn can do better than svn
  • transition will not be too expensive (technical issues, training, people-friction)
So, I started using git as my tool for working with our Subversion repository. I quickly got into the "porcelain" of git and git-svn, and early on I noticed an unexpected bonus: Git's svn-client is actually faster than Subversion's own client (!). 

So, even though I was the only git-user in a big team using Subversion, I could still use git with many of its advantages:
And the absolute greatest thing about Git is that you get rid of those pesky .svn folders. It's amazing how much meta-shit Subversion spread around in the working directory.  In our rather large project, there were literally hundreds of thousands of files and folders that only exist for Subversion's sake. 

Searching, copying, refreshing the workspace, these operations are down to a fraction of the time they used to take.

The next bonus will be when others want a taste of the advantages it brings to use the Git client. If the project allows it, we can share progress between us in feature branches before finally committing back to Subversion. This could lead to more rapid development, allowing full collaboration on experimental development without having to bother with Subversion branches. 


Read on and get started with your own local git-svn setup:

Import the Subversion repo into Git

First, install Git. I've got version: 1.7.1, for reference.

I got some big help with this from the people in the #git channel on irc.freenode.net by the way.

Read this tutorial on how to convert the Subversion repo into a Git one

Or, you could just try it out:
git svn clone --stdlayout http://scm.yourcompany.com/svn/yourproject
Clone is basically git init plus git svn fetch. The above --stdlayout will try figuring out the historical tags and branches of your repo. It takes a while, as Git will run through the whole history of the repo, and then recreate the necessary history the Git way, compress it, remove duplicates, etc.

In case of a big Subversion repo, after some minutes of importing, Git will fail with signal 13. This is a known problem, but doing git svn fetch again picks up where it stopped. Here's a little shell script that will loop until its done:
while ! git svn fetch; do echo "git-svn halted. Restarting...i"; done

Afterwards, you'll have a Git repo with git-svn set up with the Subversion repo as a remote repository. This means that you can pull (or rather rebase) changes as they come from Subversion:
git svn rebase
or push your changes back to Subversion:
git svn dcommit
I could go on about some more advanced Subversion/Git strategies, and grafting, but this post is already long enough.

I hope that some of you Subversion users will take the time to set up git-svn for yourself. It's really worth it.

Comments

  1. I can only second that, git-svn works like a charm - in fact easier and faster than the official svn client :)

    ReplyDelete

Post a Comment

Popular posts from this blog

Open source CMS evaluations

I have now seen three more or less serious open source CMS reviews. First guy to hit the field was Matt Raible ( 1 2 3 4 ), ending up with Drupal , Joomla , Magnolia , OpenCms and MeshCMS being runner-ups. Then there is OpenAdvantage that tries out a handful ( Drupal , Exponent CMS , Lenya , Mambo , and Silva ), including Plone which they use for their own site (funny/annoying that the entire site has no RSS-feeds, nor is it possible to comment on the articles), following Matt's approach by exluding many CMS that seem not to fit the criteria. It is somewhat strange that OpenAdvantage cuts away Magnolia because it "Requires J2EE server; difficult to install and configure; more of a framework than CMS", and proceed to include Apache Lenya in the full evaluation. Magnolia does not require a J2EE server. It runs on Tomcat just like Lenya does (maybe it's an idea to bundle Magnolia with Jetty to make it seem more lightweight). I'm still sure that OpenAdvant

Encrypting and Decrypting with Spring

I was recently working with protecting some sensitive data in a typical Java application with a database underneath. We convert the data on its way out of the application using Spring Security Crypto Utilities . It "was decided" that we'd be doing AES with a key-length of 256 , and this just happens to be the kind of encryption Spring crypto does out of the box. Sweet! The big aber is that whatever JRE is running the application has to be patched with Oracle's JCE  in order to do 256 bits. It's a fascinating story , the short version being that U.S. companies are restricted from exporting various encryption algorithms to certain countries, and some countries are restricted from importing them. Once I had patched my JRE with the JCE, I found it fascinating how straight forward it was to encrypt and decrypt using the Spring Encryptors. So just for fun at the weekend, I threw together a little desktop app that will encrypt and decrypt stuff for the given password

What I've Learned After a Month of Podcasting

So, it's been about a month since I launched   GitMinutes , and wow, it's been a fun ride. I have gotten a lot of feedback, and a lot more downloads/listeners than I had expected! Judging the numbers is hard, but a generous estimate is that somewhere around 2000-3000 have listened to the podcast, and about 500-1000 regularly download. Considering that only a percentage of my target audience actively listen to podcasts, these are some pretty good numbers. I've heard that 10% of the general population in the western world regularly listen to podcasts (probably a bit higher percentage among Git users), so I like to think I've reached a big chunk of the Git pros out there. GitMinutes has gathered 110 followers on Twitter, and 63, erm.. circlers on Google+, and it has received 117 +'es! And it's been flattr'ed twice :) Here are some of the things I learned during this last month: Conceptually.. Starting my own sandbox podcast for trying out everythin

The academical approach

Oops, seems I to published this post prematurely by hitting some Blogger keyboard shortcut. I've been sitting for some minutes trying to figure out how to approach the JavaZone talk mentioned in my previous blog-post. Note that I have already submitted an abstract to the comittee, and that I won't publish the abstract here in the blog. Now of course the abstract is pretty detailed on what the talk is going to be about, but I've still got some elbow room on how to "implement" the talk. I will use this blog as a tool to get my aim right on how to present the talk, what examples to include, what the slides should look like, and how to make it most straightforward and understandable for the audience. Now in lack of having done any presentations at a larger conference before, I'm gonna dig into what I learned at the University, which wasn't very much, but they did teach me how to write a research paper, a skill which I will adapt into creating my talk: The one

Git Stash Blooper (Could not restore untracked files from stash)

The other day I accidentally did a git stash -a , which means it stashes *everything*, including ignored output files (target, build, classes, etc). Ooooops.. What I meant to do was git stash -u , meaning stash modifications plus untracked new files. Anyhows, I ended up with a big fat stash I couldn't get back out. Each time I tried, I got something like this: .../target/temp/dozer.jar already exists, no checkout .../target/temp/core.jar already exists, no checkout .../target/temp/joda-time.jar already exists, no checkout .../target/foo.war already exists, no checkout Could not restore untracked files from stash No matter how I tried checking out different revisions (like the one where I actually made the stash), or using --force, I got the same error. Now these were one of those "keep cool for a second, there's a git way to fix this"situation. I figured: A stash is basically a commit. If we look at my recent commits using   git log --graph --