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

Re: libsvn_wc/merge.c:detranslate_wc_file EOL text conflicts

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 11 Feb 2011 18:51:50 +0000

Branko Čibej <brane_at_e-reka.si> writes:

> On 11.02.2011 19:38, Philip Martin wrote:
>> Am I misunderstanding how the eol stuff works? I thought the repository
>> always stored files with LF and the svn:eol-style determined how the
>> client converted the file.

> Line endings are only canonicalized to LF in the repository if
> svn:eol-style is "native". It's been this way since the property was
> first introduced way back when.

That would explain things. It appears I have forgotten how this stuff
works :-(

-- 
Philip
Received on 2011-02-11 19:52:34 CET

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.