[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] v6. Fix issue 3459.

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 14 Sep 2009 20:34:45 +0100

On Fri, Sep 11, 2009 at 09:42:40AM +0200, Daniel Näslund wrote:
> There was no patch attached. I was sure I attached one... Trying again.

Thanks so much! I'm really happy to see this fixed because it was
one of my todo items for 1.7.0.

Committed in r39311, and tweaked slightly, both the patch and the
log message. Please refer to the commit to see what I've changed.

One change worth pointing out:

> @@ -376,6 +405,10 @@
> if (starts_with(line->data, atat))
> /* Looks like we have a hunk header, let's try to rip it apart. */
> in_hunk = parse_hunk_header(line->data, *hunk, iterpool);
> +
> + if (in_hunk)
> + original_lines = (*hunk)->original_length;
> +
> else if (starts_with(line->data, minus))
> /* This could be a header of another patch. Bail out. */
> break;

You've changed which 'if' the 'else if' part belongs to! I've fixed this.
I missed this bit in the last round of review, unfortunately.
If in doubt, use { }.


Received on 2009-09-14 21:35:03 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.