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 <[EMAIL PROTECTED]> 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 > <[EMAIL PROTECTED]> 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 >
