Hello Marc
Sorry to bother you again, but can I process with the "svn:eol-style"
property?
The reason is that I would like to merge the branches. But if we do not
fix "svn:eol-style" before and if the files are not identical on all
branches, then the next merge may report lot of spurious conflicts
because Subversion may think that every lines have changed (if the EOL
style is not the same between different branches, for example because
they have been edited by developers on different platforms).
Also just in case you have the opportunity (but this is only a plus), if
you have the opportunity to move the files before the merge, that would
reduce the risk. But this is okay if you prefer not.
Martin
Le 09/01/15 09:51, Martin Desruisseaux a écrit :
> Thanks Marc.
>
> I would like to fix the "svn:eol-style" and "svn:mime-type" properties
> on the Shapefile Java files. Is there a moment when I can do this
> operation without disturbing your work?
>
> The operation may appear as if every lines were modified, but it will
> actually be Subversion automatically replacing the Windows End Of Line
> (EOL) characters by the platform-dependent ones. This is managed
> automatically by Subversion for each developer's machine, provided that
> we enabled the "svn:eol-style" property. Trailing spaces may also
> opportunistically be removed, but no other changes will be applied.
>
> Martin
