Everything In Between

If your project so much as pretends to have a profit motive, I will tell you to go fuck yourself and your project.

HowTo: Use git for personal development when everyone else is using Subversion (part 1)

6 comments

Let’s just jump into it.

Using Mac OS X, first make sure you have the git core installed as well as the git-svn components. Unlike other version control systems, git is not one monolithic program but a collection of smaller utilities, and the Subversion conduits are a subset of these utilities. The git-Subversion utilities themselves depend on having the Perl::Subversion bindings installed for Perl 5.

For the lazy MacPorts user, simply run:

sudo port install git-core +svn

This will install the git-core, the git-svn packages, as well as all the documentation for git and any required dependencies you don’t already have. Note that the documentation (man pages) is installed in /opt/local/man, which may not be in your default $MANPATH, so be sure to add that directory if man git returns a “No manual entry for git” error.

Alternatively, if you don’t want to use MacPorts, you can download a pre-compiled Mac OS X binary that includes git, the git docs, and the git-svn package from the git web site that comes complete with a standard GUI installation procedure.

Next, initialize a new git repository that tracks a remote Subversion one. This allows you to work privately using git, but to collaborate with other people who are using Subversion. Running

git svn init svn://my.svn.server/path/to/svn/repo workingcopy

will give you an empty git working copy named workingcopy configured to use the remote Subversion repository at svn://my.svn.server/path/to/svn/repo. This step is analogous to the need to run svnadmin create repo_db, to initialize a new repository database (where all the file versioning information will be stored). Unlike Subversion, git’s distributed database means that the working copy itself is also the location of the repository database, so there’s no need to deal with two filesystem paths anymore.

Next, change directory to your working copy, and run

cd workingcopy
git svn fetch

to populate your new, empty git working copy (and repository) with all the files from the remote Subversion repository.

Now that you have filled your git repository with a lot of data, if you want to, you can now also save a significant chunk of disk space by repacking that data into a more single, efficient, native packed git archive format (a .pack file). The git-repack -a command is used to do this, and its manual page says:

Instead of incrementally packing the unpacked objects, pack everything referenced into a single pack. Especially useful when packing a repository that is used for private development and there is no need to worry about people fetching via dumb protocols from it.

According to some sources, this can turn a 353MB Subversion repository into 31MB of git pack. Say:

git repack -a -d -f
Generating pack...
Counting objects: 284
Done counting 4475 objects.
Deltifying 4475 objects...
 100% (4475/4475) done
Writing 4475 objects...
 100% (4475/4475) done
Total 4475 (delta 1876), reused 0 (delta 0)
Pack pack-a115c320ff9c9968248bd250bdfea3110d0f0c1a created.
Removing unused objects 100%...
Done.

to perform the compression. For even greater savings, increase the compression by stipulating a high --window option, such as git repack -a -d -f --window=100. (--window defaults to 10—the higher the window, the harder git-repack will try to compress your stuff.) This turned a 36MB Subversion repository in one of my projects to a 20MB git pack. As always, your mileage may vary.

Congratulations, you have transformed your old Subversion repository to a git repository. All that’s left to do now is to get to the coding. Perhaps start by making a local (cheaper than cheap!) git branch….

That was easy, right? Most things in git are, in fact, that easy. If you’ve never used other version control systems before, be grateful. If you have, you can breathe a sigh of relief. Still not convinced? Don’t take my word for it…ask Linus Torvalds (or Randall Schwartz).

Written by Meitar

March 26th, 2008 at 1:54 am

Posted in HOWTO,Mac OS X,Programming,Unix/Linux

Tagged with

6 Responses to 'HowTo: Use git for personal development when everyone else is using Subversion (part 1)'

Subscribe to comments with RSS or TrackBack to 'HowTo: Use git for personal development when everyone else is using Subversion (part 1)'.

  1. [...] HowTo: Use git for personal development when everyone else is using Subversion Part 1 and Part 2 [...]

  2. How can i sync with the svn repo after using my local “git tracked” version of it?

    I might be able to find this elsewhere, I just thought Id ask here so that you could fill that in for completeness.

    Thanks!

    Lennart

    14 Mar 09 at 3:51 PM

  3. I’m not sure exactly what you’re getting at, Lennart. If you want to get the latest changes from Subversion, you want to do a git svn fetch. If you want to fetch the changes and apply them to your working tree, you need to do git svn rebase. You may also find the following two posts helpful:

    1. Part 2
    2. How To Use Git-SVN as the Only Subversion Client You’ll Need

    Meitar

    14 Mar 09 at 3:59 PM

  4. Hi Meitar,
    great post! I am currently following it.
    I have a little confusion:
    What is the difference (high-level) between this
    post and “How To Use Git-SVN as the Only Subversion Client You’ll Need”?
    In the latter you use svn git clone, but in this post you start with svn init and svn fetch!
    Are they both two different ways of doing the same thing?

    hash150

    11 Jul 11 at 3:39 PM

  5. In the latter you use svn git clone, but in this post you start with svn init and svn fetch!
    Are they both two different ways of doing the same thing?

    Yes, hash150. git svn clone is a shorthand for an init followed immediately by a fetch. See the docs for git svn and look at the clone subcommand for more detail.

    Meitar

    13 Jul 11 at 12:09 AM

  6. Hi Meitar,

    Whille ‘git svn fetch’, I am getting following error -

    Use of uninitialized value in subroutine entry at /tools/oss/perl/5.12.2/x86_64/lib/site_perl/5.12.2/x86_64-linux-thread-multi/SVN/Core.pm line 55.
    error: git-svn died of signal 11

    Not sure how to debug this.
    git version is 1.7.4
    svn version is 1.6.12

    Problem is I am not root on machines I am working on. I will install latest versions of svn and git locally and try meanwhile.

    Ninad

    Ninad

    6 Jun 13 at 5:07 AM

Leave a Reply