You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@myfaces.apache.org by Andrew Robinson <an...@gmail.com> on 2008/02/25 17:11:46 UTC
[Trinidad] EOL settings not on files
I have noticed that the text files for Trinidad do not have the eol
SVN property set. Many files have been committed using windows EOL.
Would anyone object to setting svn:eol-style to native on the trinidad
non-binary files so that the correct line endings are used on the
developers machines?
-Andrew
Re: [Trinidad] EOL settings not on files
Posted by Bernd Bohmann <be...@atanion.com>.
Hello,
maybe this helps
http://svn.collab.net/repos/svn/trunk/contrib/client-side/svn_apply_autoprops.py
Regards
Bernd
Andrew Robinson schrieb:
> Done (trunk_1.2.x = svn rev 630918, trunk = svn rev 630928)
>
> For all those who are not aware,
>
> 1) You should set the eol-style to native for every new text file that
> you add to SVN. This can be automated in you SVN settings. See [1] and
> [2] on how to do this.
> 2) when merging between branches that have different settings for eol,
> use this flag to prevent conflicts:
> svn merge -x --ignore-eol-style ...
>
> -Andrew
>
> [1] http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.5
> [2] http://www.zope.org/DevHome/Subversion/SubversionConfigurationForLineEndings
>
>
> On Mon, Feb 25, 2008 at 9:13 AM, Matthias Wessendorf <ma...@apache.org> wrote:
>> yeah, possible,
>> we "fixed" that already in the past.
>>
>> go ahead and apply the property
>>
>> -M
>>
>>
>>
>> On Mon, Feb 25, 2008 at 5:11 PM, Andrew Robinson
>> <an...@gmail.com> wrote:
>> > I have noticed that the text files for Trinidad do not have the eol
>> > SVN property set. Many files have been committed using windows EOL.
>> > Would anyone object to setting svn:eol-style to native on the trinidad
>> > non-binary files so that the correct line endings are used on the
>> > developers machines?
>> >
>> > -Andrew
>> >
>>
>>
>>
>> --
>> Matthias Wessendorf
>>
>> further stuff:
>> blog: http://matthiaswessendorf.wordpress.com/
>> sessions: http://www.slideshare.net/mwessendorf
>> mail: matzew-at-apache-dot-org
>>
>
Re: [Trinidad] EOL settings not on files
Posted by Andrew Robinson <an...@gmail.com>.
Done (trunk_1.2.x = svn rev 630918, trunk = svn rev 630928)
For all those who are not aware,
1) You should set the eol-style to native for every new text file that
you add to SVN. This can be automated in you SVN settings. See [1] and
[2] on how to do this.
2) when merging between branches that have different settings for eol,
use this flag to prevent conflicts:
svn merge -x --ignore-eol-style ...
-Andrew
[1] http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.5
[2] http://www.zope.org/DevHome/Subversion/SubversionConfigurationForLineEndings
On Mon, Feb 25, 2008 at 9:13 AM, Matthias Wessendorf <ma...@apache.org> wrote:
> yeah, possible,
> we "fixed" that already in the past.
>
> go ahead and apply the property
>
> -M
>
>
>
> On Mon, Feb 25, 2008 at 5:11 PM, Andrew Robinson
> <an...@gmail.com> wrote:
> > I have noticed that the text files for Trinidad do not have the eol
> > SVN property set. Many files have been committed using windows EOL.
> > Would anyone object to setting svn:eol-style to native on the trinidad
> > non-binary files so that the correct line endings are used on the
> > developers machines?
> >
> > -Andrew
> >
>
>
>
> --
> Matthias Wessendorf
>
> further stuff:
> blog: http://matthiaswessendorf.wordpress.com/
> sessions: http://www.slideshare.net/mwessendorf
> mail: matzew-at-apache-dot-org
>
Re: [Trinidad] EOL settings not on files
Posted by Matthias Wessendorf <ma...@apache.org>.
yeah, possible,
we "fixed" that already in the past.
go ahead and apply the property
-M
On Mon, Feb 25, 2008 at 5:11 PM, Andrew Robinson
<an...@gmail.com> wrote:
> I have noticed that the text files for Trinidad do not have the eol
> SVN property set. Many files have been committed using windows EOL.
> Would anyone object to setting svn:eol-style to native on the trinidad
> non-binary files so that the correct line endings are used on the
> developers machines?
>
> -Andrew
>
--
Matthias Wessendorf
further stuff:
blog: http://matthiaswessendorf.wordpress.com/
sessions: http://www.slideshare.net/mwessendorf
mail: matzew-at-apache-dot-org