Git & SVN on same code base

Question

I have a code base that needs to be tracked by both git and svn due to two teams working on the code with different practices.

The problem I am having is that git is storing all the .svn directories in its repo. I could use a very large .gitignore file and specify every single instance of every .svn directory for every folder but that seems cumbersome.

Is there anything I can do, or am I forced to stop using Git and use SVN & SVN combo with a switch command for different repos?

Is the tool git-svn applicable? Doesnt seem to be from what I can understand.

Thanks.

What does git-svn not do that you need?

Oliver Charlesworth
– Oliver Charlesworth

2011-08-09 19:49:33 +00:00
Commented Aug 9, 2011 at 19:49 — Oliver Charlesworth
– Oliver Charlesworth, Commented Aug 9, 2011 at 19:49

ThiefMaster · Accepted Answer · 2011-08-09 19:49:39Z

7

Tell one of the teams (preferably the SVN one) to stop being a blocker and use the same VCS the other team uses.

If that's not possible, you'll have to use SVN for the central repository and git-svn for the other team.

However, that's pretty messy and you cannot use all the nice features of git - so it would be if the SVN team switched to Git.

answered Aug 9, 2011 at 19:49

ThiefMaster

320k85 gold badges608 silver badges648 bronze badges

Sign up to request clarification or add additional context in comments.

Comments

Fred Foo · Accepted Answer · 2011-08-09 19:51:32Z

3

Just put .svn in your .gitignore, Git will match it everywhere in the tree. And yes, git-svn may be very useful, if the main repo is the SVN one.

answered Aug 9, 2011 at 19:51

Fred Foo

365k80 gold badges765 silver badges852 bronze badges

Comments

Sebastian Hoffmann · Accepted Answer · 2011-08-09 19:53:04Z

0

Do i understand you right, you have two teams working on the same code, but independent? I wouldnt do that. Imagine Team 1 changing something on the code and Team 2 doesnt know about it (since it have its own repository). Although if they just share the same code BASE, one could easily use a single repository with branches.

answered Aug 9, 2011 at 19:53

Sebastian Hoffmann

11.6k7 gold badges55 silver badges80 bronze badges

1 Comment

Raj Over a year ago

Independent teams working on the same code is one of the main purposes of VCS. Using VCS enables two teams working on the same code, and how they interact with each other is an organizational issue entirely separate.

Collectives™ on Stack Overflow

Git & SVN on same code base

3 Answers 3

Comments

Comments

1 Comment

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

3 Answers 3

Comments

Comments

1 Comment

Your Answer

Sign up or log in

Post as a guest

Related