On Tue, Nov 18, 2008 at 12:45, thomas dettbarn <dettus_at_dettus.net> wrote:
>> Subversion would not complain about inconsistent line endings unless you
>> have set the svn:eol-style property of those files to some value. So you
>> must have set svn:eol-style for these files.
>
> yes, i have it set to native.
>
>>
>> In this case, Subversion will be happy to convert a file of wholly one
>> line ending style to the correct one, but it will not attempt to change a
>> file with multiple types of line endings, which seems to be the case for you
>> after you've edited it with your editor.
>
> exactly that is the case.
> why wouldn't it change it?
I think there's an assumption made that if your EOL markers are
inconsistent, either there's something screwy going on, or you
intentionally did it. Neither of which Subversion can really account
for "automatically."
>> So the problem is that you are using a text editor that is not obeying the
>> line ending style in the files, and the solution is to fix the editor. :)
>
> no, the problem is that i am checking out files under linux and edit them
> under windows. or vice versa.
Sharing WCs between OSes isn't a recommended workflow, for reasons
like this. If you must do it, at least use a text editor that's smart
enough to understand non-native EOL markers for the OS it's running on
and keep the file consistent with itself.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-18 20:12:08 CET