From: Sam Vilain <sam@vilain.net>
To: Eric Wong <normalperson@yhbt.net>
Cc: Alex Vandiver <alex@chmrr.net>, git <git@vger.kernel.org>
Subject: Re: [spf:guess] Re: git-svn: SVK merge commits can have >2 parents
Date: Mon, 30 Nov 2009 00:26:07 +1300 [thread overview]
Message-ID: <1259493967.31767.4.camel@denix> (raw)
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
next prev parent reply other threads:[~2009-11-29 11:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-29 7:28 git-svn: SVK merge commits can have >2 parents Alex Vandiver
2009-11-29 7:46 ` Alex Vandiver
2009-11-29 8:08 ` Eric Wong
2009-11-29 11:26 ` Sam Vilain [this message]
2009-11-29 20:47 ` [spf:guess] " Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1259493967.31767.4.camel@denix \
--to=sam@vilain.net \
--cc=alex@chmrr.net \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).