[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:38:04 +0000

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.

-- 
Philip
Received on 2011-02-11 19:38:53 CET

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