10

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?
Eddy Pronk
  • 6,527
  • 5
  • 33
  • 57
  • It can be worth it and it will not be visible that you used git instead of svn. Be extremely careful with how you use 'git rebase' though. It can really make a mess of the svn history. – Daniel Luna Sep 06 '11 at 14:00
  • What kind of merge? Selected commits/revisions? Or is this a feature branch that you want to keep up-to-date with commits from the trunk, intending to reintegrate back to the trunk? – Alan Krueger Sep 07 '11 at 19:50
  • For a step-by-step guide: from http://myhumblecorner.wordpress.com/2011/08/25/git-svn-cheatsheet-for-git-rebels-in-an-svn-workplace/ `git checkout ; git merge --squash ; git commit; git svn dcommit # --squash is key` – Matt Curtis Sep 07 '11 at 23:02

3 Answers3

11

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.

thedavecollins
  • 211
  • 1
  • 4
  • I think I'm missing something. Are you saying that the SVN branches should show up as git branches in "git branch -a"? The only branches I see there are the ones I've created and "remotes/git-svn". The SVN branches only show up as their directory structure. These instructions make me wonder if SVN has a server-side concept of branches that we're not using here. – benkc Mar 17 '14 at 22:12
  • If you find this, you have missed the -s option in git clone. – boutta Sep 01 '16 at 08:52
3

Is it worth the trouble or should I just use svn to do it.

I think it depends on how you much information you want to retain in SVN. If you do the merge using git, I believe SVN will not know where the changes came from, or in other words, it will look like the SVN trunk and branch is still separate.

Will people see I've used git and is there any meta data about the merge in svn?

No, it would just look like a new commit onto trunk.

Can I do a clone of trunk and 1 branch I select?

If you mean clone your git-svn into a new git repo, then yes. Just clone the git-svn and delete the extraneous branches, or do that directly in the git-svn repo before you clone.

Here is a post how to convert an SVN repo to a git one. I think most of it would apply in this situation.

Do I need a full clone or can I import it from the point where the branch was made?

Git clones will usually be full clones, unless you use the --depth option. If you want to throw away the previous history, you can always squash all the commits into an older one, or just delete the .git directory and init a new repo.

Community
  • 1
  • 1
cmcginty
  • 113,384
  • 42
  • 163
  • 163
  • 2
    Git can make partial clone see http://stackoverflow.com/questions/747075/how-to-git-svn-clone-the-last-n-revisions-from-a-subversion-repository – hdorio Sep 06 '11 at 11:55
1

I have read a few articles of people suggesting this, but I think it should only be used if you both work with GIT and SVN for the same code (local repo with git and hosted repo with svn). I would advise you to just stick to your VCS and get a proper merge tool like BeyondCompare or Kaleidoscope

A small tutorial about git-svn can be found at

http://flavio.castelli.name/howto_use_git_with_svn

Ben
  • 13,297
  • 4
  • 47
  • 68