Philip Martin <philip.mar...@wandisco.com> writes: > Philip Martin <philip.mar...@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
