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

Re: Merge handles svn:eol-style wrongly

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 05 Sep 2008 15:51:52 +0100

On Fri, 2008-09-05 at 09:42 -0400, Paul Burba wrote:
> On Windows this creates a file like this:
>
> [[[
> Line1<CR><LF>
> Line2<CR><CR><LF>
> ]]]
[...]
> To fix the first file just call svntest.main.file_write() usings mode
> 'w' to open the file. This causes the explicit '\n' and '\r\n' to get
> written without any conversion. To fix the second file just change
> the content2 string to have explicit '\n's which get converted by
> Python to the native eol:

Thank you very much, Paul. Committed in r32930.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-05 16:52:11 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.