Author: jleroux Date: Fri Jun 12 04:55:16 2015 New Revision: 1685036 URL: http://svn.apache.org/r1685036 Log: Reverts r1669342 Because I put patch files in tools\demo-backup I thought it was a good ideas to set an entry in the svn config file. This was wrong, because it introduced svn:eol-style=native and this is a problem when you have files which can have mixed EOLs, like patch files. Because when you want to commit them svn complains with "inconsistent newlines Inconsistent line ending style" and prevents you to commit
Modified: ofbiz/site/svn/config Modified: ofbiz/site/svn/config URL: http://svn.apache.org/viewvc/ofbiz/site/svn/config?rev=1685036&r1=1685035&r2=1685036&view=diff ============================================================================== --- ofbiz/site/svn/config (original) +++ ofbiz/site/svn/config Fri Jun 12 04:55:16 2015 @@ -15,7 +15,7 @@ ### Section for configuring external helper applications. ### Set editor to the command used to invoke your text editor. ### This will override the environment variables that Subversion -### examines by default to find this information ($EDITOR, +### examines by default to find this information ($EDITOR, ### et al). ### Set diff-cmd to the absolute path of your 'diff' program. ### This will override the compile-time default, which is to use @@ -107,7 +107,6 @@ enable-auto-props = yes *.html = svn:mime-type=text/html;svn:eol-style=native;svn:keywords="Date Rev Author URL Id" *.htm = svn:mime-type=text/html;svn:eol-style=native;svn:keywords="Date Rev Author URL Id" *.css = svn:mime-type=text/css;svn:eol-style=native;svn:keywords="Date Rev Author URL Id" -*.patch = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords="Date Rev Author URL Id" *.dsp = svn:eol-style=CRLF *.bat = svn:eol-style=CRLF *.dsw = svn:eol-style=CRLF @@ -129,9 +128,9 @@ enable-auto-props = yes *.dbf = svn:mime-type=application/octet-stream *.mif = svn:mime-type=application/octet-stream *.mid = svn:mime-type=application/octet-stream -Makefile = svn:mime-type=text/plain;svn:eol-style=native -README = svn:mime-type=text/plain;svn:eol-style=native -NOTICE = svn:mime-type=text/plain;svn:eol-style=native +Makefile = svn:mime-type=text/plain;svn:eol-style=native +README = svn:mime-type=text/plain;svn:eol-style=native +NOTICE = svn:mime-type=text/plain;svn:eol-style=native LICENSE = svn:mime-type=text/plain;svn:eol-style=native ant = svn:mime-type=text/plain;svn:eol-style=LF ij.ofbiz = svn:mime-type=text/plain;svn:eol-style=LF