How do I use git-svn to merge changes from trunk to a branch in svn?

Question

I've seen people suggest to use git-svn to do the merge and commit it back to svn.

I'm looking for a good step by step guide.

• Is it worth the trouble or should I just use svn to do it.
• Will people see I've used git and is there any meta data about the merge in svn?
• Can I do a clone of trunk and 1 branch I select?
• Do I need a full clone or can I import it from the point where the branch was made?

Answer 1

I have used the instruction in this post with much success. http://justaddwater.dk/2009/03/09/using-git-for-svn-repositories-workflow/

I use git to merge between branches then commit them to the svn repo. This does not follow the merge procedure for svn and so this can be problem for other users. the svn:merge property is not set

git-svn does not leave any evidence in the svn repo that you are using git-svn.