Joakim Tjernlund <joakim.tjernlund@xxxxxxxxxxxx> wrote: > > > > -----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. With your correction following merlyn's comments, it could work[1]. I'm curious as to what change git-svn printed right before hitting an error here, and would like to see the files (before and after) that were printed by git-svn. I'm not sure what change would show up in git but cause apply_textdelta to return undef... [1] - I am tempted to apply a change based on yours, but this could just be working around another bug somewhere else (either in git-svn or subversion). > > 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 How large is the changeset you're committing? (git show --stat 2ff9bcb7908d2752f643695ab3a28f9ababfafab) I actually have a fair amount of fork() hacks in git-svn to workaround leaks in the SVN:: libraries (hard to avoid otherwise in Perl). I haven't noticed (or looked for) file-descriptor leakage very heard, though. Also, which version of git-svn are you running? Also, which version of Subversion (client library, and server (if possible) are you running? There seems to be a lot of new bugreports to git-svn lately and very little has changed in git-svn the past few months... -- Eric Wong - 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