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

Re: Textual diff bug?

From: Peter N. Lundblad <peter_at_famlundblad.se>
Date: 2006-01-23 21:46:00 CET

On Mon, 23 Jan 2006, Malcolm Rowe wrote:

> On Fri, Jan 20, 2006 at 07:46:38AM -0700, D.J. Heap wrote:
> > The attached repository demonstrates a diff bug (on Linux or Windows).
> > I debugged through it a bit and it seems to detect changed hunks
> > correctly, but doesn't output any text lines for it -- it might be
> > some kind of boundary problem since it happens at right around the end
> > of the file (which is also about 10k in size).
> >
>
> Ok, this is fallout from lundblad's enhancement to handle diffing files
> with different end-of-line markers, in r17624. In summary, the unified
> diff engine was producing the wrong output for CR- or CR/LF-terminated
> files if any CR fell at the end of a 4k chunk (in your example, this
> happens on line 80).
>
Woops! Sorry for this one:-(

> Anyway, I've implemented the obvious fix for this in r18195. Peter,
> I'm fairly sure this is correct, but could you cast your eye over it too?
>
Yes, it looks correct. Thanks, D.J. for finding it and Malcolm for fixing!

Regards,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jan 23 21:47:29 2006

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