用于Web开发的Git-SVN - 如何做到这一点？

Question

we use SVN for our work. We are a small web design studio and we write in PHP developing some kind of "framework" in the mean time.

Now we are thinking about a more powerful solution and we would like to try git-svn. We use branches as different projects — one branch, one project. So I have in my computer exactly the same structure as in my wwwroot. One branch = one project = one virtualhost.

As I played with git-svn I don't know how to achieve this with it. I need the branches to be physically present in the filesystem because I have virtulhosts in Apache etc.

Can you please give me some advice or point me to some tutorial how to do it?

Answer 1

You're doing it wrong™.

Seriously, branches are meant for, well, branches. You should use different repositories for different projects.

If I'm getting this right, you have a single framework you're working on, and several projects based on that framework. No matter what revision control system you use, that translates to one repository for the framework, and one repository for each project.

This is the reason git shows you only one branch at a time in your working copy. You usually work on a single branch at a time. You need one working copy per branch if you need to have working copies of all branches.

Answer 2

Time has shown us the best solution.

We switched to git completely with a new major version of our framework. So the projects based on an older version are still maintained through the SVN repository and the new development is running in git.

Answer 3

You can do similar thing with Git itself - see Git submodules .

In this way you have a Git repo for whole "wwwroot" and submodules for each project. If your working only on a few projects of all you can check them out/clone separately.

I have never found git-svn to be a good solution. I either use SVN or Git, not both.

Answer 4

Having just switched from svn to Git myself, I'd agree with the two answers above.

I'd also recommend against using git-svn (except perhaps to import your existing svn repositories into Git, as a once-off one-way event). And I'd also recommend using a separate Git repository for each project.

With svn, some people like to use a single repository because it's easier to share code between projects, etc. With Git, you're better using a single additional repository for all your shared stuff; if something starts out in one project and you later want to share it, do a subtree merge (that's a specifically-documented Git term, by the way) into your shared repository. Then you can pull the code back to your other projects.

Answer 5

As others have said, use separate repositories, not branches.

With SVN, you could just have..

http://svn/site_a/trunk/
http://svn/site_b/trunk/
etc

Then you can svn co http://svn/site_a/trunk/ each site separately

With git, you would just create multiple repositories:

mkdir site_a
cd site_a
git init
cd ../
mkdir site_b
cd site_b
git init

You could have a "master" repository with each site added as a sub-module, but this is not what git-submodule is intended for, and I found it more trouble than it's worth.

It's not a very good idea to use git-svn for anything more than migrating an SVN repo to git, or working on a project you don't control.

If you want to use gits branching (and it's other benefits), why not switch entirely to git? You can set it up in a somewhat-SVN-like centralised-fashion, using something like gitosis

Basically, if you like git, switch to it (rather than using git-svn ). If you are looking at git just for the branching, do not - split your SVN repository into smaller projects ( site_a/trunk/ and so on)