From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 06 Sep 2007 07:18:30 GMT
Subject: Re: [RFC/PATCH] git-svn: add support for --first-parent
Message-ID: <8c5c35580709060018p50398071s32b271d52f4dc7e3@mail.gmail.com>
In-Reply-To: <20070905101929.GB11074@soma>

On 9/5/07, Eric Wong <normalperson@yhbt.net> wrote:
> Lars Hjemli <hjemli@gmail.com> wrote:
> > When git-svn uses git-log to find embedded 'git-svn-id'-lines in commit
> > messages, it can get confused when local history contains merges with
> > other git-svn branches. But if --first-parent is supplied to git-log,
> > working_head_info() will only see 'branch-local' commits and thus the
> > first commit containing a 'git-svn-id' line should refer to the correct
> > subversion branch.
>
> Ideally, we'd probably stop, say something and give the user the choice
> of branches if multiple parents available.

Could you elaborate? (I don't understand how following the first
parent of a merge could end up at the wrong svn branch)

--
larsh