You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2005/06/11 08:58:39 UTC
svn commit: r190087 -
/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml
/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
Author: crossley
Date: Fri Jun 10 23:58:38 2005
New Revision: 190087
URL: http://svn.apache.org/viewcvs?rev=190087&view=rev
Log:
Fix line-endings and 'svn propset svn:eol-style native'
Modified:
forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml (contents, props changed)
forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml (contents, props changed)
Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml?rev=190087&r1=190086&r2=190087&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml Fri Jun 10 23:58:38 2005
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
- as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
-<document>
- <header>
- <title>Forrest 0.60 Documentation</title>
- </header>
- <body>
- <section>
- <title>Welcome!</title>
-
- </section>
-
-
- </body>
-</document>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
+<document>
+ <header>
+ <title>Forrest 0.60 Documentation</title>
+ </header>
+ <body>
+ <section>
+ <title>Welcome!</title>
+
+ </section>
+
+
+ </body>
+</document>
Propchange: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
URL: http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml?rev=190087&r1=190086&r2=190087&view=diff
==============================================================================
--- forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml (original)
+++ forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml Fri Jun 10 23:58:38 2005
@@ -1,47 +1,47 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2002-2005 The Apache Software Foundation or its licensors,
- as applicable.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document>
- <header>
- <title>Apache Forrest documentation</title>
- </header>
- <body>
- <section id="project">
- <title>Project-level documentation</title>
- <p>
- See the <a href="../">Apache Forrest Project</a> website for
- the main project-level documents.
- </p>
- </section>
- <section id="docs">
- <title>Product documentation</title>
- <p>
- For the local docs for the version of Forrest that you are using,
- see the menu at the left and the tabs above for
- <a href="site:documentation/index">Docs</a> and
- <a href="site:howto/overview">How-To</a> and
- <a href="site:plugins/index">Plugins</a>.
- </p>
- <p>
- See links to
- <a href="site:documentation/versions/overview">other versions</a>
- of documentation.
- </p>
- </section>
- </body>
-</document>
+<?xml version="1.0"?>
+<!--
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+ <header>
+ <title>Apache Forrest documentation</title>
+ </header>
+ <body>
+ <section id="project">
+ <title>Project-level documentation</title>
+ <p>
+ See the <a href="../">Apache Forrest Project</a> website for
+ the main project-level documents.
+ </p>
+ </section>
+ <section id="docs">
+ <title>Product documentation</title>
+ <p>
+ For the local docs for the version of Forrest that you are using,
+ see the menu at the left and the tabs above for
+ <a href="site:documentation/index">Docs</a> and
+ <a href="site:howto/overview">How-To</a> and
+ <a href="site:plugins/index">Plugins</a>.
+ </p>
+ <p>
+ See links to
+ <a href="site:documentation/versions/overview">other versions</a>
+ of documentation.
+ </p>
+ </section>
+ </body>
+</document>
Propchange: forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
------------------------------------------------------------------------------
svn:eol-style = native
Re: svn: line-endings appropriate for your system (Was: svn commit: r190087)
Posted by David Crossley <cr...@apache.org>.
Gregor J. Rothfuss wrote:
> David Crossley wrote:
>
> >>every time i run forrest and then want to check in the new site into
> >>svn, i have to do this, or SVN will complain. running the command above
> >>fixes this.
> >
> >There is a problem if you need to do this. Perhaps there is a
> >file in forrest that has mixed line-endings, or you have some site
> >configuration files with mixed line-endings, or perhaps there is
> >a problem in one of the plugins.
>
> i for one, will be very happy if i no longer have to check in whole
> sites to do a site update :) for me, that is one of the key motivations
> to get doco working.
>
> the spike in http://people.apache.org/~coar/commits_lenya_apache_org.png
> is from my last 'commit the whole site' adventure. it sent 300 mails.
Well a lot of it is from someone's misconfigured subversion client.
I saw stacks of voluminous PDF diffs. That is because it has the wrong
svn properties. PDF should be not be treated as text. The example configuration
file [1] prevents such a mess.
[1] http://www.apache.org/dev/version-control.html#https-svn
--David
Re: svn: line-endings appropriate for your system (Was: svn commit:
r190087)
Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
David Crossley wrote:
>>every time i run forrest and then want to check in the new site into
>>svn, i have to do this, or SVN will complain. running the command above
>>fixes this.
>
> There is a problem if you need to do this. Perhaps there is a
> file in forrest that has mixed line-endings, or you have some site
> configuration files with mixed line-endings, or perhaps there is
> a problem in one of the plugins.
i for one, will be very happy if i no longer have to check in whole
sites to do a site update :) for me, that is one of the key motivations
to get doco working.
the spike in http://people.apache.org/~coar/commits_lenya_apache_org.png
is from my last 'commit the whole site' adventure. it sent 300 mails.
Re: svn: line-endings appropriate for your system (Was: svn commit: r190087)
Posted by David Crossley <cr...@apache.org>.
Gregor J. Rothfuss wrote:
> David Crossley wrote:
>
> >>for /r %A in (*.xml) do dos2unix %A
> >>for /r %A in (*.xml) do svn propset svn:eol-style native %A
> >
> >But why would you do dos2unix on a windows system?
> >Shouldn't it be unix2dos i.e. native?
>
> every time i run forrest and then want to check in the new site into
> svn, i have to do this, or SVN will complain. running the command above
> fixes this.
There is a problem if you need to do this. Perhaps there is a
file in forrest that has mixed line-endings, or you have some site
configuration files with mixed line-endings, or perhaps there is
a problem in one of the plugins.
> >Each committer must ensure that patches and new files
> >have line-endings appropriate for their own system. Then ensure
> >that your svn client automatically sets the 'svn:eol-style native'.
> >http://www.apache.org/dev/version-control.html#https-svn
>
> i have this set up, doesn't matter for updates
Yes, not for updates. That configuration file is for doing
the 'svn add'.
> >People using fancy IDEs, i wonder if you would be better to do
> >your svn operations with the command-line client.
>
> it's not fancy, and has nothing to do with IDEs, sorry ;)
Well i have seen a lot of trouble from poorly configured
Eclipse systems.
--David
Re: svn: line-endings appropriate for your system (Was: svn commit: r190087)
Posted by David Crossley <cr...@apache.org>.
Thorsten Scherler wrote:
> Gregor J. Rothfuss wrote:
> > David Crossley wrote:
> >
> > >>for /r %A in (*.xml) do dos2unix %A
> > >>for /r %A in (*.xml) do svn propset svn:eol-style native %A
> > >
> > > But why would you do dos2unix on a windows system?
> > > Shouldn't it be unix2dos i.e. native?
>
> It has to be on a windows box dos2unix because our SVN server is set up
> on linux. With other words dos2unix = dos2native in our case.
No that is not true. The SVN property 'svn:eol-style native' ensures
that the line-endings are adjusted on checkout, to the native line-endings
of your operating system.
The following section of the SVN Book thoroughly explains the issue,
its impact on other developers, and the solution.
http://svnbook.red-bean.com/en/1.0/svn-book.html#svn-ch-7-sect-2.3.5
--David
Re: svn: line-endings appropriate for your system (Was: svn commit:
r190087)
Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
Thorsten Scherler wrote:
>>i have this set up, doesn't matter for updates
>
> Hmm, could it be that this is a svn bug on windows? I am on debian
> derivate linux and since I set it up it works like a charm.
it only gets applied on add, not update. and no, this is not a bug ;)
> ...just use e.g. unbuntu and you will never miss windows and have always
> eol-style set. ;-)
sorry, but that was lame.
Re: svn: line-endings appropriate for your system (Was: svn
commit: r190087)
Posted by Thorsten Scherler <th...@apache.org>.
On Sat, 2005-06-11 at 12:40 -0400, Gregor J. Rothfuss wrote:
> David Crossley wrote:
>
> >>for /r %A in (*.xml) do dos2unix %A
> >>for /r %A in (*.xml) do svn propset svn:eol-style native %A
> >
> > But why would you do dos2unix on a windows system?
> > Shouldn't it be unix2dos i.e. native?
>
It has to be on a windows box dos2unix because our SVN server is set up
on linux. With other words dos2unix = dos2native in our case.
> every time i run forrest and then want to check in the new site into
> svn, i have to do this, or SVN will complain. running the command above
> fixes this.
>
> > Each committer must ensure that patches and new files
> > have line-endings appropriate for their own system. Then ensure
> > that your svn client automatically sets the 'svn:eol-style native'.
> > http://www.apache.org/dev/version-control.html#https-svn
>
> i have this set up, doesn't matter for updates
>
Hmm, could it be that this is a svn bug on windows? I am on debian
derivate linux and since I set it up it works like a charm.
...just use e.g. unbuntu and you will never miss windows and have always
eol-style set. ;-)
salu2
--
thorsten
"Together we stand, divided we fall!"
Hey you (Pink Floyd)
Re: svn: line-endings appropriate for your system (Was: svn commit:
r190087)
Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
David Crossley wrote:
>>for /r %A in (*.xml) do dos2unix %A
>>for /r %A in (*.xml) do svn propset svn:eol-style native %A
>
> But why would you do dos2unix on a windows system?
> Shouldn't it be unix2dos i.e. native?
every time i run forrest and then want to check in the new site into
svn, i have to do this, or SVN will complain. running the command above
fixes this.
> Each committer must ensure that patches and new files
> have line-endings appropriate for their own system. Then ensure
> that your svn client automatically sets the 'svn:eol-style native'.
> http://www.apache.org/dev/version-control.html#https-svn
i have this set up, doesn't matter for updates
> People using fancy IDEs, i wonder if you would be better to do
> your svn operations with the command-line client.
it's not fancy, and has nothing to do with IDEs, sorry ;)
svn: line-endings appropriate for your system (Was: svn commit: r190087)
Posted by David Crossley <cr...@apache.org>.
Gregor J. Rothfuss wrote:
> Ferdinand Soethe wrote:
>
> >Have now taken the time to find and incorporate the setting for the
> >line endings (different in windows of course). I you still come across
> >faulty ones I need to stop using subsclipse.
>
> you might find this shell script for windows useful:
>
> for /r %A in (*.xml) do dos2unix %A
> for /r %A in (*.xml) do svn propset svn:eol-style native %A
But why would you do dos2unix on a windows system?
Shouldn't it be unix2dos i.e. native?
Each committer must ensure that patches and new files
have line-endings appropriate for their own system. Then ensure
that your svn client automatically sets the 'svn:eol-style native'.
http://www.apache.org/dev/version-control.html#https-svn
People using fancy IDEs, i wonder if you would be better to do
your svn operations with the command-line client.
--David
Re: svn commit: r190087 - /forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml
/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
Ferdinand Soethe wrote:
> Have now taken the time to find and incorporate the setting for the
> line endings (different in windows of course). I you still come across
> faulty ones I need to stop using subsclipse.
you might find this shell script for windows useful:
for /r %A in (*.xml) do dos2unix %A
for /r %A in (*.xml) do svn propset svn:eol-style native %A
Re: svn commit: r190087 - /forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml /forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
Posted by Ferdinand Soethe <ma...@soethe.net>.
Thanks for now.
Have now taken the time to find and incorporate the setting for the
line endings (different in windows of course). I you still come across
faulty ones I need to stop using subsclipse.
Ferdinand
> Author: crossley
> Date: Fri Jun 10 23:58:38 2005
> New Revision: 190087
> URL: http://svn.apache.org/viewcvs?rev=190087&view=rev
> Log:
> Fix line-endings and 'svn propset svn:eol-style native'
> Modified:
>
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml
> (contents, props changed)
>
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
> (contents, props changed)
> Modified:
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml
> URL:
> http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml?rev=190087&r1=190086&r2=190087&view=diff
> ==============================================================================
> ---
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml
> (original)
> +++
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml
> Fri Jun 10 23:58:38 2005
> @@ -1,31 +1,31 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<!--
> - Copyright 2002-2005 The Apache Software Foundation or its licensors,
> - as applicable.
> -
> - Licensed under the Apache License, Version 2.0 (the "License");
> - you may not use this file except in compliance with the License.
> - You may obtain a copy of the License at
> -
> - http://www.apache.org/licenses/LICENSE-2.0
> -
> - Unless required by applicable law or agreed to in writing, software
> - distributed under the License is distributed on an "AS IS" BASIS,
> - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> - See the License for the specific language governing permissions and
> - limitations under the License.
--->>
> -<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation
> V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
> -<document>
> - <header>
> - <title>Forrest 0.60 Documentation</title>
> - </header>
> - <body>
> - <section>
> - <title>Welcome!</title>
> -
> - </section>
> -
> -
> - </body>
> -</document>
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> + Copyright 2002-2005 The Apache Software Foundation or its licensors,
> + as applicable.
> +
> + Licensed under the Apache License, Version 2.0 (the "License");
> + you may not use this file except in compliance with the License.
> + You may obtain a copy of the License at
> +
> + http://www.apache.org/licenses/LICENSE-2.0
> +
> + Unless required by applicable law or agreed to in writing, software
> + distributed under the License is distributed on an "AS IS" BASIS,
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + See the License for the specific language governing permissions and
> + limitations under the License.
+-->>
> +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation
> V1.2//EN" "http://forrest.apache.org/dtd/document-v12.dtd">
> +<document>
> + <header>
> + <title>Forrest 0.60 Documentation</title>
> + </header>
> + <body>
> + <section>
> + <title>Welcome!</title>
> +
> + </section>
> +
> +
> + </body>
> +</document>
> Propchange:
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_60/index.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native
> Modified:
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
> URL:
> http://svn.apache.org/viewcvs/forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml?rev=190087&r1=190086&r2=190087&view=diff
> ==============================================================================
> ---
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
> (original)
> +++
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
> Fri Jun 10 23:58:38 2005
> @@ -1,47 +1,47 @@
> -<?xml version="1.0"?>
> -<!--
> - Copyright 2002-2005 The Apache Software Foundation or its licensors,
> - as applicable.
> -
> - Licensed under the Apache License, Version 2.0 (the "License");
> - you may not use this file except in compliance with the License.
> - You may obtain a copy of the License at
> -
> - http://www.apache.org/licenses/LICENSE-2.0
> -
> - Unless required by applicable law or agreed to in writing, software
> - distributed under the License is distributed on an "AS IS" BASIS,
> - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> - See the License for the specific language governing permissions and
> - limitations under the License.
--->>
> -<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation
> V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
> -<document>
> - <header>
> - <title>Apache Forrest documentation</title>
> - </header>
> - <body>
> - <section id="project">
> - <title>Project-level documentation</title>
> - <p>
> - See the <a href="../">Apache Forrest Project</a> website for
> - the main project-level documents.
> - </p>
> - </section>
> - <section id="docs">
> - <title>Product documentation</title>
> - <p>
> - For the local docs for the version of Forrest that you are using,
> - see the menu at the left and the tabs above for
> - <a href="site:documentation/index">Docs</a> and
> - <a href="site:howto/overview">How-To</a> and
> - <a href="site:plugins/index">Plugins</a>.
> - </p>
> - <p>
> - See links to
> - <a href="site:documentation/versions/overview">other versions</a>
> - of documentation.
> - </p>
> - </section>
> - </body>
> -</document>
> +<?xml version="1.0"?>
> +<!--
> + Copyright 2002-2005 The Apache Software Foundation or its licensors,
> + as applicable.
> +
> + Licensed under the Apache License, Version 2.0 (the "License");
> + you may not use this file except in compliance with the License.
> + You may obtain a copy of the License at
> +
> + http://www.apache.org/licenses/LICENSE-2.0
> +
> + Unless required by applicable law or agreed to in writing, software
> + distributed under the License is distributed on an "AS IS" BASIS,
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + See the License for the specific language governing permissions and
> + limitations under the License.
+-->>
> +<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation
> V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
> +<document>
> + <header>
> + <title>Apache Forrest documentation</title>
> + </header>
> + <body>
> + <section id="project">
> + <title>Project-level documentation</title>
> + <p>
> + See the <a href="../">Apache Forrest Project</a> website for
> + the main project-level documents.
> + </p>
> + </section>
> + <section id="docs">
> + <title>Product documentation</title>
> + <p>
> + For the local docs for the version of Forrest that you are using,
> + see the menu at the left and the tabs above for
> + <a href="site:documentation/index">Docs</a> and
> + <a href="site:howto/overview">How-To</a> and
> + <a href="site:plugins/index">Plugins</a>.
> + </p>
> + <p>
> + See links to
> + <a href="site:documentation/versions/overview">other versions</a>
> + of documentation.
> + </p>
> + </section>
> + </body>
> +</document>
> Propchange:
> forrest/branches/docs_reorg_200506_branch/site-author/content/xdocs/docs_0_70/index.xml
> ------------------------------------------------------------------------------
> svn:eol-style = native