On 11.02.2011 19:38, Philip Martin wrote:
> Philip Martin <philip.martin_at_wandisco.com> writes:
>
>> Philip Martin <philip.martin_at_wandisco.com> writes:
>>
>>> But does cause 3 FAILs in merge_tests.py:
>>> FAIL: merge_tests.py 34: conflict markers should match the file's eol style
>>> FAIL: merge_tests.py 35: handle eol-style propchange during merge
>>> FAIL: merge_tests.py 110: dav skelta mode can cause spurious conflicts
>> 110 was spurious, I had other changes in my tree.
> 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.
>
> At present merge_tests.py 34 is creating a file with CRLF endings,
> setting svn:eol-style to CRLF and committing it. The repository file
> has CRLF endings. I was expecting it to get converted to LF before
> being sent to the repository.
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.
-- Brane
Received on 2011-02-11 19:43:43 CET