How to clone a nonstandard svn repo to git?

问题:

I try to clone a svn repo to git, but some of the branches are in the svn root dir like follows.

I've tried

$ git clone svn://url/svn-root -T trunk -b branches -b branch1 -b branch2

and

$ git clone svn://url/svn-root -T trunk -b branches -b .

Both are failed to clone the branch1 and branch2 correctly. Please help.

svn-root
├── branch1
├── branch2
├── branches
│   ├── branch3
│   └── branch4
└── trunk

回答1:

One interesting tool, mentioned in GitMinutes Episode 20, is SubGit, a plugin for Atalssian Stash (which isn't free, but you can try it for free).
You can know much more about SubGit in "GitMinutes #22: Alexander Kitaev about SubGit".

It is designed to managed unconventional svn repo layout.

Dmitry Pavlenko comments:

you should enter in the "Branches" field:

*:refs/heads/*;branches/*:refs/heads/branches/* 
# instead of 
branches/* 

In this case branch1 will be translated to refs/heads/branch1,
branch3 --- to refs/heads/branches/branch3.

Alternatively, if you have limited number of top-level branches, you can enumerate them explicitly:

branch1:refs/heads/branch1;
branch2:refs/heads/branch2;
branches/*:refs/heads/bra‌​nches/*

回答2:

Two options come to mind:

• Clean up your SVN repo first (Move branches below /branches, where they should be according to standard layout).
• Checkout using standard layout, add remote branch refs later on.