Re: eol style differences

Greg Hudson wrote:

>On Tue, 2003-03-11 at 16:32, Sander Striker wrote:
>
>
>>>We can, but I think the point is to avoid the complexity of translating
>>>keywords one way and newlines the other. We can translate them both
>>>from base-style to wc-style as long as we make sure to use the same
>>>keyword translations as we used for the current wc copy.
>>>
>>>
>>Wouldn't that screw up context in diffs? [it might contain the expanded
>>keywords]
>>
>>
>
>That depends on whether you think it's "screwed up" to have an expanded
>keyword in the context.
>
>Certainly, if you produce a context diff and then try to apply it to a
>different working copy, you'll get a conflict. But a collapsed keyword
>would also generate a conflict.
>
>
Right. What we should try to avoid is diffs caused by different
keywords, but we can't do anything if the keywords are in the context of
another diff.

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org