Re: Multiple branches and git-svn

From: Benoit SIGOURE <tsuna@lrde.epita.fr>
Date: Aug 21, 2007, 10:06 UTC
Message-ID: <9FD13095-36B5-4663-B658-082981B1ACD9@lrde.epita.fr>
In-Reply-To: <864pj16r10.fsf@lola.quinscape.zz>

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

Show 14 quoted lines

>
> 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.

I hope this helps.

Cheers,

-- 
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory