incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: [Repo][Proposal] OOO340 SVN Dump file import
Date Thu, 18 Aug 2011 07:21:45 GMT
Rob Weir wrote on Wed, Aug 17, 2011 at 19:58:44 -0400:
> On Wed, Aug 17, 2011 at 5:15 PM, Michael Stahl <mst@openoffice.org> wrote:
> > On 16.08.2011 20:41, Rob Weir wrote:
> >>
> >> During local svn import I received several error messages like this:
> >>
> >> "svn: Inconsistent line ending style"
> >>
> >> The following files gave this error:
> >>
> >> /ooo/trunk/core/dictionaries/de_DE/README_hyph_de_DE.txt
> >> /ooo/trunk/core/dictionaries/de_CH/README_hyph_de_CH.txt
> >> /ooo/trunk/core/dictionaries/de_AT/README_hyph_de_AT.txt
> >> /ooo/trunk/core/gettext/gettext-0.18.1.1.patch
> >> /ooo/trunk/core/apache-commons/patches/codec.patch
> >> /ooo/trunk/core/libcroco/libcroco-0.6.2.patch
> >> /ooo/trunk/core/graphite/graphite-2.3.1.patch
> >
> >> /ooo/trunk/core/filter/source/xslt/odf2xhtml/export/common/body.xsl
> >>
> >> /ooo/trunk/core/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
> >> /ooo/trunk/core/solenv/bin/cwstouched.pl
> >> /ooo/trunk/core/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
> >> /ooo/trunk/core/writerfilter/source/doctok/escher.html
> >
> > guess these just need proper consistent EOL.
> >
> >> /ooo/trunk/core/testautomation/writer/optional/input/import/mactext.txt
> >
> > this one is called "mactext", maybe it wants mac EOL.
> > there is a "dostext.txt" "wintext.txt" "unixtext.txt" in the same dir.
> >
> 
> Presumably we want these to be come down as-is without any EOL conversion.
> 
> The options for the svn:eol-style property are:
> 
> native -- store in normalized format, and bring down in client's native style
> 
> CRLF -- bring down always with DOS/Windows convention
> 
> LF -- bring down in Unix convention
> 
> CR -- not sure who uses that? Is that Mac?
> 
> But odd that dostext.txt and wintext.txt are different files.  Perhaps
> it is testing character set as well?  Might be safer to just treat
> these test files as binary files, e.g., set svn:mime-type to
> "application/octet-stream".

Subversion will treat the contents of files as opaque ("binary") byte
strings UNLESS svn:keywords or svn:eol-style is set.  No need for
explicit MIME type setting.

(and it might interfere with accessing those files in $BROWSER)

Mime
View raw message