Re: svn add and inconsistent line endings

On 24.02.2013 17:00, Stefan Küng wrote:
> On 24.02.2013 16:47, Bert Huijben wrote:
>>
>>
>>> -----Original Message-----
>>> From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
>>> Sent: zondag 24 februari 2013 15:39
>>> To: Subversion Development
>>> Subject: svn add and inconsistent line endings
>>>
>>> Hi,
>>>
>>> When auto-props are set up for e.g., cpp files that set the
>>> svn:eol-style property, adding those files is not possible if the file
>>> has inconsistent line endings.
>>> The --force flag won't help either, the only way to add the file is to
>>> first fix the line endings in an editor.
>>> Or add the file with --no-auto-props and then add the properties later.
>>>
>>> I think this situation is not good.
>>> Maybe another param added to svn_client_add5 that ignores the EOL
>>> check?
>>> Or just pass the 'force' flag on to svn_wc__canonicalize_props()
>>> instead
>>> of passing 'false' unconditionally in libsvn_wc\adm_ops.c,
>>> svn_wc_add_from_disk2() ?
>>
>> I don't think simply ignoring this and allowing the add to continue is a
>> good enough solution.
>>
>> Just passing the skip checks flags will allow adding many wrong
>> properties
>> which will cause a lot of grief later, and I would guess adding the file
>> would just delay the error until we try to commit this file.
>>
>>
>> But looking at this from the AnkhSVN side, I would like to have some
>> api to
>> make the eols on files consistent... Would this work for you?
>
> The API already exists, since when passing the --force flag to the
> propset command (adding the svn:eol-style property), then the file is
> automatically adjusted.
>
> I agree that the add command should still check the other properties.
> So why not add a separate flag to only skip the EOL check?
> Or maybe just automatically adjust the EOLs when adding the file? I
> never understood why that check is there.

I'd say that "force" should always do the same thing for equivalent
cases, so in this case, it should tell the library to adjust line
endings, if that's what "svn propset" does. Autoprops should behave
exactly as if a series of propsets were issued.

-- Brane

-- 
Branko ÄŒibej
Director of Subversion | WANdisco | www.wandisco.com