Git-SVN with multiple branch locations?

Question

Our company subversion repo is a bit tricky: We've got a basic "default" layout with trunk, tags and branches. However, inside the branches, we have a "work" directory which contains more branches. Something like this:

• branches/release_1_0_x
• branches/release_1_1_x
• branches/work/dave/topic_one
• branches/work/tom/topic_two
• branches/work/something_else

Now how can I get git-svn to recognize all those (and a few more) as separate branches? It appears git svn init only accepts one branch location, how ever I'm invoking it.

Edit: this is how I initialized the git repo:

git svn clone  -s --prefix=svn/ http://svn.company.com/product/

Answer 1

According to the answer to another question, your best bet is to use Git 1.6.x and take advantage of "deep cloning".

If you can't upgrade to 1.6.x, then you can specify multiple branches when you clone.

git svn clone -s --prefix=svn/ -b branches -b branches/work/dave -b branches/work/tom ...

You'll just have to make sure you add info for new users to your .git/config before "git svn fetch"ing when a new user branch has been added.