From: Sam Vilain <sam@vilain.net>
To: Eric Wong <normalperson@yhbt.net>
Cc: Andrew Myrick <amyrick@apple.com>, git@vger.kernel.org
Subject: Re: [spf:guess] Re: Regression: git-svn clone failure
Date: Wed, 23 Dec 2009 09:35:32 +1300 [thread overview]
Message-ID: <1261514132.23944.6.camel@denix> (raw)
In-Reply-To: <20091222192115.GA10313@dcvr.yhbt.net>
On Tue, 2009-12-22 at 11:21 -0800, Eric Wong wrote:
> That looks like a simple error, does the following patch help?
>
> diff --git a/git-svn.perl b/git-svn.perl
> index 3670960..dba0d12 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -3163,7 +3163,8 @@ sub find_extra_svn_parents {
> next unless $new_parents[$i];
> next unless $new_parents[$j];
> my $revs = command_oneline(
> - "rev-list", "-1", "$i..$j",
> + "rev-list", "-1",
> + "$new_parents[$i]..$new_parents[$j]",
> );
Yes, that is the intent.
Hrm, I'd have thought my test would have stepped over that code when it
merged in a branch which merged two an svn branch which included a merge
of another svn branch. Obviously not! I'll cook something up to cover
that..
Sam.
prev parent reply other threads:[~2009-12-22 20:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-22 18:43 Regression: git-svn clone failure Andrew Myrick
2009-12-22 19:21 ` Eric Wong
2009-12-22 19:38 ` Andrew Myrick
2009-12-22 20:26 ` Eric Wong
2009-12-22 21:13 ` Sam Vilain
2009-12-22 21:38 ` Junio C Hamano
2009-12-23 0:09 ` Sam Vilain
2009-12-22 23:50 ` Andrew Myrick
2009-12-23 0:09 ` Sam Vilain
2009-12-22 20:35 ` Sam Vilain [this message]
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=1261514132.23944.6.camel@denix \
--to=sam@vilain.net \
--cc=amyrick@apple.com \
--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).