tags:

views:

20

answers:

0

Hello,

I'm using git-svn to track multiple branches in the same svn repository. Usually this works fine, but today I've done some resets and rebases, and suddenly my branches wouldn't dcommit to the right remote branch anymore:

$ git branch
* master
  a
  b

$ git svn dcommit -n
Committing to svn://server/repo/trunk ...

$ git checkout a
$ git svn dcommit -n
Committing to svn://server/repo/branches/a ...

$ git checkout b
$ git svn dcommit -n
Committing to svn://server/repo/branches/a ...

So the branch b would commit to the branches/a directory instead of the branches/b directory.

I've tried changing the branch that is tracked:

$ git branch --set-upstream b remotes/b

And other things, but the only solution that worked was to delete the branch b and recreate it:

$ git branch -D b
$ git branch b remotes/b
$ git svn dcommit -n
Committing to svn://server/repo/branches/b ...

Now my question is: how does git svn determine what directory to commit to? And how do I modify this directory?

Thanks,
Jonas