Re: Multiple branches and git-svn

Benoit SIGOURE [off-list ref] writes:

On Aug 15, 2007, at 12:17 PM, David Kastrup wrote:

quoted

After having had several embarrassing occurences with git-svn dcommit,
I think it would not be amiss to mention in the docs just how git-svn
happens to figure out which Subversion remote it is associated with.

One surprising relevation was that this association changed after a
git-rebase.

It may be a general git thing, or it may be git-svn specific, but it
was not exactly what I expected.  And the docs were not really that
helpful.

In particular, man git-svn is completely silent about this.

What I do usually is that I look in git log until I see a git-svn-id
line:
git-svn-id: https://svn.foo.com/svn/project/branches/bar@<rev-SVN>
<Repository UUID>
AFAIK git-svn dcommit will commit in the branch specified in the last
git-svn-id.  I also dcommitted in the wrong branch after a rebase
because I imported commits from another branch and the topmost commit
in git-log was "pointing to" a different branch.

Sounds insane: apparently one result is that when you do a merge and
dcommit, the commit will go to the branch you merged.

The whole point of merging is to stay on one's current branch.

-- 
David Kastrup