Skip to main content

The Dream of a Bi-directional Git-SVN mirror

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

I just got an email asking me how one can set up a bi-directional Git-SVN mirror. It ended up being quite a long answer, so I'll post it here for the benefit of other Git-SVN readers with the same idea.

As you may know, I'm a proponent of my own Git-SVN setup.

I remember trying to go down the path of a bi-directional repository, but always ran into problems. Here is how it could work:




However nice this would be to have, it can be very hard to achieve in practice:

Git-svn requires working in a non-bare repository, so pushing to it is by default refused. You can work around this by doing this in the target sync repo:

git config receive.denyCurrentBranch ignore

You also have to automatically perform a git reset --hard in the syncing repo after each push (by some git hook?), because the work-dir is considered dirty when it is out of sync with the repository (a consequence of the previous workaround).

And now comes the really tricky part. Consider the following example:

  1. Bob commits change A in his local git repository, and pushes this to the sync repo.
  2. The sync repo does a git svn fetch (automatically to retain linear history).
  3. It then performs a dcommit, but in doing so, Bob's commit is re-written (with SVN meta data), therefore the commit changes into being .
  4. The central git repo dcommits the change to the SVN repo.

You see what has happened now? Bob's history has diverged from that of the sync repo:

Bob's history:    X <- Y <- Z <- A
Central history: X <- Y <- Z <- A´

So the next time Bob does a pull, Git will see that history has diverged, and automatically create a merge commit so Bob's history looks like this:
                               A
Bob's history: X <- Y <- Z <- /  \ <- merge commit
                              \  /
                               A´

You don't want this to happen, because next time Bob pushes, the merge commit will be dcommited, and so an evil circle is created.

You can avoid this by getting Bob to do a git pull --rebase, as Git (at least now when I tried it out) automagically figures out that A and are actually the same commit, and discards the former of them appropriately.

You still will have to deal with some other problems:

* Concurrency between commits - basically if somebody commits to SVN before the git repository has a time to sync a push from a git user, your syncing-repo gets messed up and needs to be manually reset (and probably the git pusher will have to repeat his push). This can get ugly, and it would happen relatively often in a busy repository.

* In case you have set up a physically split bare-repo and fetching-repo (like I've recommended on numerous occasions), the concurrency issues get slightly worsened, as you need to implement some locking mechanism across both repositories. Perhaps the best thing to do here is to go back to one single git/svn syncing-repo instead.

In summary:

  • Your developers will have to always do pull --rebase before and after pushing.
  • It has to be a low-traffic subversion repository, preferably all committers sitting co-located.
  • You have to be ready to dive in and fix any problems quickly (or have several people who can).

So, I hope you have enough information to properly consider whether this is worth going for. If you do, I would love to hear how it works out.

For the record: I do not recommend the bi-directional syncing repo approach. I still prefer my original setup where each developer is responsible for dcommitting back to Subversion. It's not so much more complicated for the Git users, and it is much safer, concurrency-wise.

Popular posts from this blog

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 and sa…

Managing dot-files with vcsh and myrepos

Say I want to get my dot-files out on a new computer. Here's what I do:

# install vcsh & myrepos via apt/brew/etc
vcsh clone https://github.com/tfnico/config-mr.git mr
mr update

Done! All dot-files are ready to use and in place. No deploy command, no linking up symlinks to the files. No checking/out in my entire home directory as a Git repository. Yet, all my dot-files are neatly kept in fine-grained repositories, and any changes I make are immediately ready to be committed:

config-atom.git
    -> ~/.atom/*

config-mr.git
    -> ~/.mrconfig
    -> ~/.config/mr/*

config-tmuxinator.git  
    -> ~/.tmuxinator/*

config-vim.git
    -> ~/.vimrc
    -> ~/.vim/*

config-bin.git   
    -> ~/bin/*

config-git.git          
    -> ~/.gitconfig

config-tmux.git  
    -> ~/.tmux.conf    

config-zsh.git
    -> ~/.zshrc

How can this be? The key here is to use vcsh to keep track of your dot-files, and its partner myrepos/mr for operating on many repositories at the same time.

I discovere…

Always use git-svn with --prefix

TLDR: I've recently been forced back into using git-svn, and while I was at it, I noticed that git-svn generally behaves a lot better when it is initialized using the --prefix option.

Frankly, I can't see any reason why you would ever want to use git-svn without --prefix. It even added some major simplifications to my old git-svn mirror setup.

Update: Some of the advantages of this solution will disappear in newer versions of Git.

For example, make a standard-layout svn clone:

$ git svn clone -s https://svn.company.com/repos/project-foo/

You'll get this .git/config:

[svn-remote "svn"]
        url = https://svn.company.com/repos/
        fetch = project-foo/trunk:refs/remotes/trunk
        branches = project-foo/branches/*:refs/remotes/*
        tags = project-foo/tags/*:refs/remotes/tags/*

And the remote branches looks like this (git branch -a):
    remotes/trunk
    remotes/feat-bar

(Compared to regular remote branches, they look very odd because there is no remote name i…

Considerations for JavaScript in Modern (2013) Java/Maven Projects

Disclaimer: I'm a Java developer, not a JavaScript developer. This is just what I've picked up the last years plus a little research the last days. It's just a snapshot of my current knowledge and opinions on the day of writing, apt to change over the next weeks/months.

We've gone all modern in our web applications, doing MVC on the client side with AngularJS or Ember, building single-page webapps with REST backends. But how are we managing the growing amount of JavaScript in our application?
You ain't in Kansas anymore So far we've just been doing half-random stuff. We download some version of a library and throw it into our src/main/webapp/js/lib, or we use it from a CDN, which may be down or unreachable when we want to use the application..

Some times the JS is minified, other times it's not. Some times we name the file with version number, other times without. Some times we get the latest library of master branch and name it with the commit-id in the fi…

Microsoft ups their Git efforts another notch

This week Microsoft announced first class Git support embedded in the coming version of Visual Studio.

Now, it's not completely shocking. We could have seen it coming since Microsoft started offering Git repos on CodePlex, and more recently offering a Git client for TFS. In any case, these are some big news. Scott Hanselman weighs on some features and some more background here.

For those who are a bit unaware of what the Git situation on Windows looks like these days, I've dotted down these notes:
Some explanation on these:

msysGit has long been The Way to use Git on Windows. It's basically a port of Git itself, so it's a command-line tool.GitExtensions (includes Visual Studio integration), TortoiseGit, Git Shell, posh-git and most other tools are powered by msysGit.libgit2 is a native library for doing Git stuff. It is developed completely separate from Git itself. The above tools could (and should) probably use libgit2 instead of hooking onto and around msysGit.Github…