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

2011-02-11 Thread Philip Martin
Branko Čibej 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 re

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

2011-02-11 Thread Branko Čibej
On 11.02.2011 19:38, Philip Martin wrote: > Philip Martin writes: > >> Philip Martin 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 >>>

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

2011-02-11 Thread Philip Martin
Philip Martin writes: > Philip Martin 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 cau

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

2011-02-11 Thread Philip Martin
Philip Martin 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

libsvn_wc/merge.c:detranslate_wc_file EOL text conflicts

2011-02-11 Thread Philip Martin
I've been looking at some spurious text conflicts during merge that are caused because we attempt to merge files with different line endings. The script at the end of this mail shows the problem, it's a very simple merge and it doesn't change the EOL style. The problem is detranslate_wc_file. It