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

Re: Line-endings in libsvn_diff was Re: OS/2 port, working through the tests

From: Brian Havard <brianh_at_kheldar.apana.org.au>
Date: 2004-07-24 09:33:47 CEST

On Sat, 24 Jul 2004 14:23:15 +1000 (EST), Brian Havard wrote:

>On Thu, 22 Jul 2004 11:17:25 -0700, Justin Erenkrantz wrote:
>
>>--On Wednesday, July 21, 2004 9:08 PM +1000 Brian Havard
>><brianh@kheldar.apana.org.au> wrote:

>>> I found the first was a line end problem (OS/2 uses DOS style CR/LF) as
>>> making changes like the diff below makes the test pass. So which is wrong,
>>> the test or the library?
>>
>>I think it's the test in this particular situation. I think all of the
>>'output' in the tests should be terminated with APR_EOL_STR as diff outputs
>>the line encoding of the host OS not what's in the file, IIRC.
>>
>>Yet, if that's the case, I'm wondering how it passes on Win32 then as it
>>should have the same problem. Sander? -- justin
>
>That's what I suspected but I also wondered how/if it passed on windows.

Actually, it turns out that I'd made a change to the diff code to make it
output the right eol characters. If I remove that change the tests pass but
diff output to the console is screwed up. The OS/2 console responds to a LF
character literally, moving down a line but not resetting the column so
output looks like:

line1
     line2
          line3
etc.

So is there any good reason why libsvn_diff always outputs LF for eol
rather than the APR_EOL_STR?

-- 
 ______________________________________________________________________________
 |  Brian Havard                 |  "He is not the messiah!                   |
 |  brianh@kheldar.apana.org.au  |  He's a very naughty boy!" - Life of Brian |
 ------------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jul 24 09:34:06 2004

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.