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

Re: Problem with diff

From: Adam Miazga <adammiazga_at_gmail.com>
Date: Tue, 18 Oct 2011 14:33:44 +0200

Hi.

I resolv my problem.
When I set "*.p = svn:eol-style=native" in config file then svn ses

svn: E200009: File '..\kadr.polon.p' has inconsistent newlines
svn: E135000: Inconsistent line ending style

I'm convert line ending in my file and work fine.

in subversion 1.6 the problem does not exist.

I don't known if is a bug or feature ;-)

Best regards
Adam Miazga

2011/10/18 Daniel Shahaf <d.s_at_daniel.shahaf.name>:
> Andreas Krey wrote on Tue, Oct 18, 2011 at 10:37:36 +0200:
>> On Tue, 18 Oct 2011 10:22:33 +0000, Daniel Shahaf wrote:
>> ...
>> > > Replacing each char by another one (individually, not caesar).
>> > > But stays, though no duplicate lines:
>> > >
>> >
>> > Huh?  This transformation doesn't deduplicate, there were duplicate lines
>> > to begin with, so the result should also contain duplicates.
>>
>> Er, it does. Each character is replaced by a random one, and the
>> next same character by another random one, so 'aaaa' becomes 'ehaf'
>> (or 'qrhs' or whatever, of course).
>>
>
> Ah, I thought you passed the file through tr(1).
>
>> ..
>> > > I really like to see *that* patch.
>> > >
>> >
>> > Which one?  The one introducing the bug or fixing it?
>> >
>>
>> The fix, where it is easier to see what went wrong (hopefully in the
>> commit message). Gotta be interesting. Didn't even think to bisect for
>> the regression up to now.
>>
>> Is the diff engine separate from the delta computation?
>>
>
> Yes.  libsvn_diff is about line-based diffs/merges; libsvn_delta is
> about binary deltas and their wire representation as svndiff streams.
> (Yes, the naming is... confusing.)
>
>> Andreas
>>
>> --
>> "Totally trivial. Famous last words."
>> From: Linus Torvalds <torvalds@*.org>
>> Date: Fri, 22 Jan 2010 07:29:21 -0800
>
Received on 2011-10-18 14:34:18 CEST

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

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