From: Sam Vilain <sam@vilain.net>
Date: Sun, 29 Nov 2009 11:26:07 GMT
Subject: Re: [spf:guess] Re: git-svn: SVK merge commits can have >2 parents
Message-ID: <1259493967.31767.4.camel@denix>
In-Reply-To: <20091129080815.GC24222@dcvr.yhbt.net>

On Sun, 2009-11-29 at 08:08 +0000, Eric Wong wrote:
> Alex Vandiver <alex@chmrr.net> wrote:
> > At Sun Nov 29 02:28:39 -0500 2009, Alex Vandiver wrote:
> > > While converting a mildly complicated svn repository that was managed
> > > with SVK, I ran across the following oddness.  `svk smerge` can only
> > > merge between _two_ branches at once -- however, the way that svk
> > > merge detection works, you can end up with erroneous extra parents
> > > from long-dead branches.
> > 
> > Upon a little more inspection, I now understand that the rev-parse
> > lines in find_extra_svk_parents are attempting to deal with this exact
> > circumstance -- but they fail to properly sort the merge tickets
> > first, which leads to this incorrect behavior.  Armed with this
> > understanding, I'm more confident in the attached updated patch.  I
> 
> Hi Alex, Sam,
> 
> I'll defer to Sam for the Ack, my svk knowledge is limited. Thanks.

Yes, the change does make sense to me - nicely done, Alex.

Acked-By: Sam Vilain <sam@vilain.net>

Sam