> -----Original Message----- > From: Randal L. Schwartz [mailto:merlyn@xxxxxxxxxxxxxx] > Sent: den 13 oktober 2006 21:40 > To: Joakim Tjernlund > Cc: git@xxxxxxxxxxxxxxx > Subject: Re: git-svn and u-boot broken. > > >>>>> "Joakim" == Joakim Tjernlund > <joakim.tjernlund@xxxxxxxxxxxx> 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html