From: David Barr <david.barr@cordelta.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Ramkumar Ramachandra <artagnon@gmail.com>,
Sverre Rabbelier <srabbelier@gmail.com>,
Sam Vilain <sam@vilain.net>, Stephen Bash <bash@genarts.com>,
Tomas Carnecky <tom@dbservice.com>
Subject: Re: Status of the svn remote helper project (Nov 2010, #2)
Date: Mon, 22 Nov 2010 13:06:44 +1100 [thread overview]
Message-ID: <201011221306.45096.david.barr@cordelta.com> (raw)
In-Reply-To: <20101121230613.GA24397@burratino>
Hi,
> >> A delta in r36 of <http://svn.apache.org/repos/asf> does not apply
> >> with this brand of svn-fe.
> >
> > That's odd, I was able to import up to r354 before receiving:
> > fatal: missing newline after cat-blob response
>
> Apparently sometimes deltas use the whole preimage and sometimes they
> don't.
>
> Here's a fix (still needs a simple reproduction script).
I'm testing this path along with the following changes.
The first just removes a compile-time warning.
The second fixes a memory leak.
Sorry, my send-email-fu is not up to scratch.
Signed-off-by: David Barr <david.barr@cordelta.com>
---
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index 02456cf..a95a5c9 100644
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -127,7 +127,6 @@ static long apply_delta(uint32_t mark, off_t len, struct
line_buffer *input,
die("cannot open temporary file for blob retrieval");
if (old_mark) {
const char *response;
- off_t dummy;
printf("cat-blob :%"PRIu32"\n", old_mark);
fflush(stdout);
response = get_response_line();
@@ -147,6 +146,7 @@ static long apply_delta(uint32_t mark, off_t len, struct
line_buffer *input,
ret = buffer_tmpfile_prepare_to_read(&postimage);
if (ret < 0)
die("cannot read temporary file for blob retrieval");
+ strbuf_release(&preimage.buf);
return ret;
}
next prev parent reply other threads:[~2010-11-22 2:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-07 11:21 Status of the svn remote helper project (Nov, 2010) Jonathan Nieder
2010-11-07 12:06 ` David Michael Barr
2010-11-08 3:56 ` David Barr
2010-11-08 6:11 ` Jonathan Nieder
2010-11-08 6:20 ` David Barr
2010-11-07 12:50 ` Ramkumar Ramachandra
2010-11-07 17:42 ` Jonathan Nieder
2010-11-21 6:31 ` Status of the svn remote helper project (Nov 2010, #2) Jonathan Nieder
2010-11-21 9:38 ` David Michael Barr
2010-11-21 23:06 ` Jonathan Nieder
2010-11-22 2:06 ` David Barr [this message]
2010-12-05 11:37 ` Status of the svn remote helper project (Dec 2010, #1) Jonathan Nieder
2010-12-08 18:26 ` Tomas Carnecky
2010-12-12 6:14 ` fast-import tweaks for remote helpers (Re: Status of the svn remote helper project (Dec 2010, #1)) Jonathan Nieder
2010-12-12 9:53 ` Sam Vilain
2010-12-12 17:16 ` fast-import tweaks for remote helpers Jonathan Nieder
2011-01-05 21:20 ` fast-import --report-fd (Re: fast-import tweaks for remote helpers) Jonathan Nieder
2011-01-05 23:39 ` Status of the svn remote helper project (Jan 2011, #1) Jonathan Nieder
2011-01-07 14:00 ` David Michael Barr
2011-02-11 9:09 ` Plans for the vcs-svn-pu branch Jonathan Nieder
2011-02-11 10:36 ` [PATCH] svn-fe: warn about experimental status Jonathan Nieder
2011-02-11 15:49 ` Plans for the vcs-svn-pu branch Ramkumar Ramachandra
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201011221306.45096.david.barr@cordelta.com \
--to=david.barr@cordelta.com \
--cc=artagnon@gmail.com \
--cc=bash@genarts.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sam@vilain.net \
--cc=srabbelier@gmail.com \
--cc=tom@dbservice.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).