Geek Answers Handbook

Using git and svn with multiple developers

I have an svn repository (without a TLB structure, if that matters) that I want to use with git. I can make a git-svn clone, work on my changes to the git repository, and return to svn repo whenever I do this. This is clear up to this point.

I am not sure how to extend this workflow model to several developers. I need my development team to be able to work with a single repo (w22> repo) (which is cloned from the svn repository), which should behave like a regular repo for all of us. At some point, any developer should be able to return to the svn repository. Is it possible? Thank.

+5
source share
3 answers

We had the same problem, and we did not find a way to do this, so let's move on to full git. Everything works fine if only one repo communicates with svn, but otherwise becomes messy. What happens in git-svn branches has its own life

You can just try this - create for repo git1 and git2 from svn.
- make changes to git 1 and dcommit to svn
- pull it int git2, run git svn rebase and see what happens ...

git2, , svn, . git2 2 svn one git1. , - git2 svn, git1 svn ( ). (, , , , )

, , , 'git -svn' 'git', git -, dcommit svn. svn, git, .

git, , svn.

+1

,

  • svn svn, walko svn, git, walko-svn
  • git.

alt text http://larrycai.files.wordpress.com/2013/02/image2.png

  • svn- git -svn clone..., master -svn
  • git, svn
  • git ,
  • , -, dcommit svn ( git -svn-id), git -. ( , svn trigger)
  • git svn repo

  • git , svn (, master)
  • svn- svn
  • git () svn repo

. http://larrycaiyu.com/blog/2010/07/10/svn-git-integration-1/

+1

Our team had exactly the same problem, and after a little experiment, we managed to create a two-way git-Subversion bridge that synchronizes the changes between our git repository and the corporate Subversion repository. See my answer at fooobar.com/questions/189885 / ... or see https://github.com/mrts/git-svn-bridge

0
source

More articles:


All Articles