2

I've been trying to figure this one out by reading the git-svn man-page but am having trouble understanding how to achieve it.

What I want to do is:

  1. Checkout a public subversion trunk
  2. Create a local git repo to track this
  3. Create a 'vendor' branch which I will not commit to and will only use for pulling changes from the subversion repo
  4. Create git branches for patches I wish to work on
  5. Pull updates to the 'vendor' branch and merge into my branches.
  6. Submit patches with git-format-patch

How do I achieve this?

Brett Ryan
  • 26,937
  • 30
  • 128
  • 163

2 Answers2

4

Suggested workflow for git-svn:

  1. Pull using git-svn mentioned above.
  2. By default, you will be in master. DO NOT WORK DIRECTLY ON THIS BRANCH.
  3. Do all your development in a feature branch (use git checkout -b <feature> from master).
  4. Commit changes to your feature branch.
  5. Do git rebase master in your feature branch. 5a. If you want to pull in svn updates at this time, then switch to master and do git svn rebase. Then switch back to feature branch, do git rebase master.
  6. Switch to master branch and do git merge <feature>.
  7. Check that merge goes smoothly, then do git svn dcommit to push changes to svn.

Remember, once you do git svn dcommit all your changes will become visible to others. So be absolutely sure you have done things properly before doing git svn dcommit.

rmk
  • 4,395
  • 3
  • 27
  • 32
  • Excellent, thanks very much for this. I did a git-svn-clone and created my branch. I'll never need to push upstream and just want to create patch files. I'll have to wait for svn commits to test the svn-rebase. – Brett Ryan Dec 18 '10 at 18:38
  • Also sorry for the delay, I was having trouble at work on our RHEL machine complaining about missing perl files that I couldn't fix when I was trying to git-svn-clone, nothing I seemed to do would work, fine at home on my Mac :) – Brett Ryan Dec 18 '10 at 18:39
0

You want to use git-svn. I'm not sure what the state of available tutorials is, but here's some stuff to get you started.

Creating your local git repo.

How to git-svn clone the last n revisions from a Subversion repository?

To fetch new revisions from svn use git svn fetch. This will fetch new revisions and put them on a remote branch. You can make whatever changes you want on your own branch, then commit using git svn dcommit.

But, I would be careful with the git merge command. When using git-svn I always recommend using rebase, and making your history strictly linear. svn can't track git branches very well. If you have a branched history in git and try to push that to svn, svn will only be able to represent one half of that history. You won't lose any code, but you will lose granularity of your commits.

Community
  • 1
  • 1
haydenmuhl
  • 5,998
  • 7
  • 27
  • 32