views:

3780

answers:

3

A word of warning: I'm a n00b to git in general. My team uses feature branches in svn, and I'd like to use git-svn to track my work on a particular feature branch. I've been (roughly) following Andy Delcambre's post to set up my local git repo, but those instructions seem to have led git to pick the svn branch that had changed most recently as the remote repository; the problem is that's not the branch I care about. How do I control which branch git-svn uses? Or am I approaching this completely wrong?

UPDATE: I did use the -T, -b, and -t options (in my case because the svn repo has multiple projects, but I want the git repo to contain only the project I'm working on).

+1  A: 

I use git-svn but I haven't used the features that interoperate with SVN branches. Having said that, I notice that the tutorial you were following didn't use the -T, -b, -t options to git svn init. These options tell git-svn what the upstream trunk/branches/tags directories are named, which might be important in your situation.

Greg Hewgill
Thanks, Greg. Unfortunately for me, that's the difference between my setup and the one in the blog.
Hank Gay
+4  A: 

Muchas gracias to Bart's Blog for this handy reference for svn branches in git. Apparently all I needed was to specify a remote branch when creating the git branch, e.g.,

git checkout -b git-topic-branch-foo foo

where foo is the name of the remote branch.

Hank Gay
+7  A: 

You might also have a look at this: git-svn is a gateway drug - robby on rails.

I used something like this when I needed to make sure that my local branch was pointing to the correct remote svn branch:

git branch -r

to get the name of the remote branch I want to be tracking. Then

git reset --hard remotes/svn-branch-name

to explicitly change my local branch to point to a different remote branch.

Sam Mulube