You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by David Crossley <cr...@apache.org> on 2005/09/11 03:03:13 UTC
svn line-endings config (Was: svn commit: r279905 - in /cocoon/site/site/link: livesites-2.1.html livesites-2.1.pdf)
Erk, something went wrong. This generated file has Windows
end-of-line markers, so that makes it look like the whole
file was changed. It is not your fault Jorg. The svn:eol-style
property is not set, so this is the effect. Each time someone
generates it on different platforms, then line endings will
change and therefore huge diffs.
I will try to clean up the mess.
Would everyone please make sure that their SVN client
is properly configured.
http://www.apache.org/dev/version-control.html#https-svn
-David
> Author: jheymans
> Date: Fri Sep 9 15:57:35 2005
> New Revision: 279905
>
> URL: http://svn.apache.org/viewcvs?rev=279905&view=rev
> Log:
> publishing new livesites
>
> Modified:
> cocoon/site/site/link/livesites-2.1.html
> cocoon/site/site/link/livesites-2.1.pdf
>
> Modified: cocoon/site/site/link/livesites-2.1.html
> URL: http://svn.apache.org/viewcvs/cocoon/site/site/link/livesites-2.1.html?rev=279905&r1=279904&r2=279905&view=diff
> ==============================================================================
> --- cocoon/site/site/link/livesites-2.1.html (original)
> +++ cocoon/site/site/link/livesites-2.1.html Fri Sep 9 15:57:35 2005
> @@ -1,687 +1,821 @@
> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
> -<html>
> -<head>
Re: svn line-endings config (Was: svn commit: r279905 - in /cocoon/site/site/link: livesites-2.1.html livesites-2.1.pdf)
Posted by David Crossley <cr...@apache.org>.
Jorg Heymans wrote:
> David Crossley wrote:
> > Erk, something went wrong. This generated file has Windows
> > end-of-line markers, so that makes it look like the whole
> > file was changed. It is not your fault Jorg. The svn:eol-style
> > property is not set, so this is the effect. Each time someone
> > generates it on different platforms, then line endings will
> > change and therefore huge diffs.
>
> That is wierd though, I had noticed this and checked my svn config :
> *.html = svn:eol-style=native and auto-props enabled. I figured
> something else must have been in play so I didn't think much of it.
> Maybe my TortoiseSVN messed up, dunno.
No, as i said it is not you.
Because none of these files had their svn properties
set, then for me on unix and you on windows, we kept
changing the line-endings back and forth.
Anyway it is fixed now.
-David
Re: svn line-endings config (Was: svn commit: r279905 - in /cocoon/site/site/link: livesites-2.1.html livesites-2.1.pdf)
Posted by Niclas Hedhman <ni...@hedhman.org>.
On Sunday 11 September 2005 17:20, Jorg Heymans wrote:
> That is wierd though, I had noticed this and checked my svn config :
> *.html = svn:eol-style=native and auto-props enabled. I figured
> something else must have been in play so I didn't think much of it.
> Maybe my TortoiseSVN messed up, dunno.
The "auto props" only applies to newly generated files, never to files already
existing in the repository.
Cheers
Niclas
Re: svn line-endings config (Was: svn commit: r279905 - in /cocoon/site/site/link:
livesites-2.1.html livesites-2.1.pdf)
Posted by Jorg Heymans <jh...@domek.be>.
David Crossley wrote:
> Erk, something went wrong. This generated file has Windows
> end-of-line markers, so that makes it look like the whole
> file was changed. It is not your fault Jorg. The svn:eol-style
> property is not set, so this is the effect. Each time someone
> generates it on different platforms, then line endings will
> change and therefore huge diffs.
>
That is wierd though, I had noticed this and checked my svn config :
*.html = svn:eol-style=native and auto-props enabled. I figured
something else must have been in play so I didn't think much of it.
Maybe my TortoiseSVN messed up, dunno.
Thanks
Jorg