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

Re: svn commit: r40403 - trunk/subversion/libsvn_diff

From: Branko Cibej <brane_at_xbc.nu>
Date: Fri, 06 Nov 2009 18:34:55 +0100

Arfrever Frehtes Taifersar Arahesis wrote:
> 2009-11-06 16:37:10 Stefan Sperling napisaƂ(a):
>> Author: stsp
>> Date: Fri Nov 6 07:37:10 2009
>> New Revision: 40403
>> Log:
>> Make 'svn patch' ignore "\ No newline at end of file" marker lines.
>> They were interpreted as context and caused text conflicts.
> I think that the fix is wrong. `svn patch` should ignore lines which are after
> lines specified as belonging to given hunk in @@ lines (e.g. '-1,2 +1,2' in example
> below)

I think both the fix and your proposal are wrong. :) Though your
proposal is less wrong than the fix.

The "no newline at end of file" marker is important information about
context and tells the patch algorithm how to modify its context search.
Unless I'm totally sozzled, i means that the last line of the hunk's
context does not contain an EOLN -- so if you search for the whole line,
you'll most likely never find the context you're looking for.

-- Brane

Received on 2009-11-06 18:35:12 CET

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