From: "Joakim Tjernlund" <joakim.tjernlund@transmode.se>
To: "'Randal L. Schwartz'" <merlyn@stonehenge.com>
Cc: <git@vger.kernel.org>
Subject: RE: git-svn and u-boot broken.
Date: Sat, 14 Oct 2006 03:21:34 +0200 [thread overview]
Message-ID: <00e301c6ef2f$16993ac0$1267a8c0@Jocke> (raw)
In-Reply-To: <86slhsgg3f.fsf@blue.stonehenge.com>
> -----Original Message-----
> From: Randal L. Schwartz [mailto:merlyn@stonehenge.com]
> Sent: den 13 oktober 2006 21:40
> To: Joakim Tjernlund
> Cc: git@vger.kernel.org
> Subject: Re: git-svn and u-boot broken.
>
> >>>>> "Joakim" == Joakim Tjernlund
> <joakim.tjernlund@transmode.se> writes:
>
> Joakim> First, I had to change this (from memory) in git-svn:
> Joakim> my $got = SVN::TxDelta::send_stream($fh, @$atd,
> $self->{pool});
> Joakim> to
> Joakim> my $got;
> Joakim> if ( $got ) {
> Joakim> $got = SVN::TxDelta::send_stream($fh, @$atd,
> $self->{pool});
> Joakim> } else {
> Joakim> $got = $exp
> Joakim> }
> Joakim> I am no perl programmer so please change as you se fit.
>
> That doesn't make any sense. You'll never run the if-true
> branch there.
> The value of $got immediately following "my $got;" is always undef.
git-pull --squash seems to do what I want but know I get this when
committing to svn:
git-svn commit remotes/git-svn..svn-branch
...
A cpu/mpc824x/drivers/i2c_export.h
A cpu/mpc824x/drivers/i2o.h
A cpu/mpc824x/drivers/i2o/Makefile
A cpu/mpc824x/drivers/i2o/Makefile_pc
Cannot allocate memory at /usr/bin/git-svn line 1462
3072 at /usr/bin/git-svn line 547
main::commit_lib('2ff9bcb7908d2752f643695ab3a28f9ababfafab') called at /usr/bin/git-svn line 457
main::commit('remotes/git-svn..svn-branch') called at /usr/bin/git-svn line 149
Jocke
next prev parent reply other threads:[~2006-10-14 1:23 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-13 19:19 git-svn and u-boot broken Joakim Tjernlund
2006-10-13 19:39 ` Randal L. Schwartz
2006-10-13 19:43 ` Joakim Tjernlund
2006-10-14 1:21 ` Joakim Tjernlund [this message]
2006-10-14 6:28 ` Eric Wong
2006-10-14 9:51 ` Joakim Tjernlund
2006-10-14 22:46 ` Eric Wong
2006-10-14 22:48 ` [PATCH] git-svn: reduce memory usage for large commits Eric Wong
2006-10-14 23:54 ` git-svn and u-boot broken Joakim Tjernlund
-- strict thread matches above, loose matches on Subject: below --
2006-10-14 13:13 Joakim Tjernlund
2006-10-14 21:09 ` Eric Wong
2006-10-15 0:39 ` Joakim Tjernlund
2006-10-15 1:48 ` Eric Wong
2006-10-15 2:10 ` Joakim Tjernlund
2006-10-15 22:09 Joakim Tjernlund
2006-10-16 3:47 ` Eric Wong
2006-10-16 10:06 ` Joakim Tjernlund
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='00e301c6ef2f$16993ac0$1267a8c0@Jocke' \
--to=joakim.tjernlund@transmode.se \
--cc=git@vger.kernel.org \
--cc=merlyn@stonehenge.com \
/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).