Norbert Unterberg wrote:
> Simon Large schrieb:
>
>>> 2. When I diff a file it always has on the 'server' side a LF ending
>>> and
>>> on the client side a CRLF ending.
>>> This results in a completely changed file.
>>>
>>>
>> Setting auto-props only affects files which are added to the
>> repository. Files already in there will not be affected. You need to
>> set the svn:eol-style property on every text file in the repository
>> to native.
>>
>>
> No that does not help. On the contrary, it is the svn:eol-style native
> property that causes this. Once you set the property, subversion
> stores the file in the repository in a normalized text format which
> is LF only. The pristine copy in the text-base folder is also stored
> in this internal format. So whenever you compare that file to your
> working copy version, all the line endings do not match.
>
> This is a problem of subversion or with the tools you use. You might
> look for a diff application that properly converts line endings when
> you copy from one pane to the other. The internal diff tool
> (TortoiseMerge) does it, as far as I know.
Ah, I understand the problem now. And maybe there is a solution. TSVN
passes the pristine copy directly to the external diff program. Maybe
that is not a safe thing to do anyway, because the external program
could modify the pristine copy. So we could solve 2 problems if the
pristine copy was converted to the same eol-style in a temp file before
passing to the external diff/merge program. That _might_ slow things
down a bit for large files.
Simon
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jun 1 19:10:57 2005