You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lenya.apache.org by "J. Wolfgang Kaltz" <ka...@interactivesystems.info> on 2005/06/02 12:04:48 UTC

svn usage / adding new files to Lenya repository (Re: svn commit: r179490 - /lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java)

gregor@apache.org schrieb:
> Author: gregor
> Date: Wed Jun  1 19:47:20 2005
> New Revision: 179490
> (...)
> Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java
> URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java?rev=179490&r1=179489&r2=179490&view=diff
> ==============================================================================
> --- lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java (original)
> +++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java Wed Jun  1 19:47:20 2005
> @@ -1,365 +1,364 @@
> -/*
> - * Copyright  1999-2005 The Apache Software Foundation
> - *

Hi everybody,
a note on svn usage: all text files in the repository should have the 
"svn:eol-style" property set to native. If not, a file edited once in 
MS-Windows and once somewhere else will show a change on every single 
line, as in the example above. This is a problem because it means you 
can't see the actual changes to the source.

The problem is that it is up to the client you use to set these 
properties, apparently there is nothing that can be done to have them 
set automatically by the SVN server.

This means that, if you add a new file to the repository, please make 
sure the properties are set. IMO these should be
   svn:keywords=Id
   svn:eol-style=native

The above file DocumentTypeBuilderImpl.java was my fault, since I first 
added it, so I can name it without offending any one - besides myself ;) .
In fact, I have a client SVN configuration file with this content:

    enable-auto-props = yes
    [auto-props]
    *.xmap = svn:keywords=Id svn:eol-style=native
    *.java = svn:keywords=Id svn:eol-style=native

but I just realized this has no effect :( My client creates files 
without any properties set. I don't know it it's a bug, setup error, ...

If you know more about these issues, please free to comment - I'm still 
learning (in this case, from 
http://svnbook.red-bean.com/en/1.1/ch07s02.html), but not everything is 
yet working as expected.


--
Wolfgang

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org


Re: svn usage / adding new files to Lenya repository (Re: svn commit: r179490 - /lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java)

Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
Thorsten Scherler wrote:

> Hmm, mine is:
> [auto-props]
> *.aart = svn:eol-style=native
> 
> which works fine. I guess in your case it is the "svn:keywords=Id" bit
> which is too much. For a full list please use the list in
> http://issues.cocoondev.org/browse/FOR-124

i also noticed that autoprops do not work reliably. i therefore run a 
shell script every now and then:

for /r %A in (*.java) do svn propset svn:eol-style native %A

the unix equivalent is left as an excercise for the reader ;)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org


Re: svn usage / adding new files to Lenya repository (Re: svn commit: r179490 - /lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java)

Posted by Thorsten Scherler <th...@apache.org>.
On Thu, 2005-06-02 at 12:04 +0200, J. Wolfgang Kaltz wrote:
> gregor@apache.org schrieb:
> > Author: gregor
> > Date: Wed Jun  1 19:47:20 2005
> > New Revision: 179490
> > (...)
> > Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java
> > URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java?rev=179490&r1=179489&r2=179490&view=diff
> > ==============================================================================
> > --- lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java (original)
> > +++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DocumentTypeBuilderImpl.java Wed Jun  1 19:47:20 2005
> > @@ -1,365 +1,364 @@
> > -/*
> > - * Copyright  1999-2005 The Apache Software Foundation
> > - *
> 
> Hi everybody,
> a note on svn usage: all text files in the repository should have the 
> "svn:eol-style" property set to native. If not, a file edited once in 
> MS-Windows and once somewhere else will show a change on every single 
> line, as in the example above. This is a problem because it means you 
> can't see the actual changes to the source.
> 

+1

> The problem is that it is up to the client you use to set these 
> properties, apparently there is nothing that can be done to have them 
> set automatically by the SVN server.
> 
> This means that, if you add a new file to the repository, please make 
> sure the properties are set. IMO these should be
>    svn:keywords=Id
>    svn:eol-style=native
> 
> The above file DocumentTypeBuilderImpl.java was my fault, since I first 
> added it, so I can name it without offending any one - besides myself ;) .

:) lol

> In fact, I have a client SVN configuration file with this content:
> 
>     enable-auto-props = yes
>     [auto-props]
>     *.xmap = svn:keywords=Id svn:eol-style=native
>     *.java = svn:keywords=Id svn:eol-style=native
> 

Hmm, mine is:
[auto-props]
*.aart = svn:eol-style=native

which works fine. I guess in your case it is the "svn:keywords=Id" bit
which is too much. For a full list please use the list in
http://issues.cocoondev.org/browse/FOR-124


HTH
salu2


> but I just realized this has no effect :( My client creates files 
> without any properties set. I don't know it it's a bug, setup error, ...
> 
> If you know more about these issues, please free to comment - I'm still 
> learning (in this case, from 
> http://svnbook.red-bean.com/en/1.1/ch07s02.html), but not everything is 
> yet working as expected.
> 
> 
> --
> Wolfgang
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
> For additional commands, e-mail: dev-help@lenya.apache.org
> 
-- 
thorsten

"Together we stand, divided we fall!" 
Hey you (Pink Floyd)


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org