You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@lenya.apache.org by Jann Forrer <ja...@id.unizh.ch> on 2005/06/15 12:28:46 UTC
svn questions
Hi
I am a bit confused with the svn stuff. I did a fresh co:
svn co https://svn.apache.org/repos/asf/lenya/trunk lenya-trunk
I made some modificatin in the file
src/webapp/lenya/usecases/admin/tabs.jx. Within this file you have
<!-- $Id: tabs.jx 164233 2005-04-22 13:01:45Z jwkaltz $ -->
Accroding to .svn/entries this means the last author was jwklatz. However
if I change the file and make a svn diff I get
Index: tabs.jx
===================================================================
--- tabs.jx (revision 190723)
+++ tabs.jx (working copy)
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: overview.jx 123960 2005-01-03 12:39:05Z andreas $ -->
+<!-- $Id$ -->
The website:
https://svn.apache.org/repos/asf/lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx
also shows andreas as the last author.
Why are the author the version and the date different?
BTW how can i assure that <!-- $Id$ --> is expanded with the necessary
informations (i.e. version, date, author)? Is this done by svn
automatically?
Jann
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn questions
Posted by Thorsten Scherler <th...@apache.org>.
On Thu, 2005-06-16 at 09:27 +0200, Michael Wechner wrote:
> Gregor J. Rothfuss wrote:
>
> > Thorsten Scherler wrote:
> >
> >>> Actually, we might want to discuss if we shouldn't remove these lines.
> >>
> >>
> >> I am +1 to remove this tag. We did this in the documentation, I
> >> reckon we should
> >> do it here as well.
> >
> >
> > -1 i would suggest that all commiters make themselves familiar with
> > svn instead, and use svn propset as required.
>
>
> let's not mix one with the other. It's one thing to understand SVN (and
> share this information) and the other thing why something is useful.
>
Yes, I agree. As for getting familiar with svn you can get the
information from $ID by doing:
svn log /src/somefile.txt
I reckon that is enough.
> The $Id keyword might be useful when people have the sourcecode deployed
> for instance at some customer without having a local SVN, which allows
> to check on the version of a file, but I remember there was some very
> good reason why not to use the $Id keyword,
> but I have forgotton what it was (someone within the Jackrabbit ML
> pointed this out)
> and cannot find it currently. Well, let me see if can find it ...
>
Yeah please look for it. ...another good reason is the same issue like
for authors in docs. People tend to contact the author ($id contains the
last updater but people normally see them equal) because his name is
written in the tag.
Like michi said svn usage and usage of the $id are two different things.
salu2
--
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
Re: svn questions
Posted by Michael Wechner <mi...@wyona.com>.
Gregor J. Rothfuss wrote:
> Thorsten Scherler wrote:
>
>>> Actually, we might want to discuss if we shouldn't remove these lines.
>>
>>
>> I am +1 to remove this tag. We did this in the documentation, I
>> reckon we should
>> do it here as well.
>
>
> -1 i would suggest that all commiters make themselves familiar with
> svn instead, and use svn propset as required.
let's not mix one with the other. It's one thing to understand SVN (and
share this information) and the other thing why something is useful.
The $Id keyword might be useful when people have the sourcecode deployed
for instance at some customer without having a local SVN, which allows
to check on the version of a file, but I remember there was some very
good reason why not to use the $Id keyword,
but I have forgotton what it was (someone within the Jackrabbit ML
pointed this out)
and cannot find it currently. Well, let me see if can find it ...
Michi
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
> For additional commands, e-mail: dev-help@lenya.apache.org
>
>
--
Michael Wechner
Wyona - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
michael.wechner@wyona.com michi@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn questions
Posted by "Gregor J. Rothfuss" <gr...@apache.org>.
Thorsten Scherler wrote:
>>Actually, we might want to discuss if we shouldn't remove these lines.
>
> I am +1
> to remove this tag. We did this in the documentation, I reckon we should
> do it here as well.
-1 i would suggest that all commiters make themselves familiar with svn
instead, and use svn propset as required.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn questions
Posted by Thorsten Scherler <th...@apache.org>.
On Wed, 2005-06-15 at 13:08 +0200, Michael Wechner wrote:
> Jann Forrer wrote:
>
> >
> >Why are the author the version and the date different?
> >
> >
>
> IIRC this line is CVS and SVN doesn't do anything with it.
>
> Actually, we might want to discuss if we shouldn't remove these lines.
>
I am +1
to remove this tag. We did this in the documentation, I reckon we should
do it here as well.
thorsten
> Michi
>
> >
> >BTW how can i assure that <!-- $Id$ --> is expanded with the necessary
> >informations (i.e. version, date, author)? Is this done by svn
> >automatically?
> >
> >Jann
> >
> >---------------------------------------------------------------------
> >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
Re: svn questions
Posted by Michael Wechner <mi...@wyona.com>.
Jann Forrer wrote:
>
>Why are the author the version and the date different?
>
>
IIRC this line is CVS and SVN doesn't do anything with it.
Actually, we might want to discuss if we shouldn't remove these lines.
Michi
>
>BTW how can i assure that <!-- $Id$ --> is expanded with the necessary
>informations (i.e. version, date, author)? Is this done by svn
>automatically?
>
>Jann
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
>For additional commands, e-mail: dev-help@lenya.apache.org
>
>
>
>
--
Michael Wechner
Wyona - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
michael.wechner@wyona.com michi@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn questions
Posted by Michael Wechner <mi...@wyona.com>.
J. Wolfgang Kaltz wrote:
>
> It is only done automatically if the appropriate property is set:
> svn propset svn:keywords "Id" <your-file>
>
> Unfortunately, this property is not set by default. So if you create a
> new file (or find one where this is not yet set), you need to set the
> property and do svn commit (a property change is a change to the
> repository, as is a content change)
I didn't know that. Thanks for the explanation.
Michi
--
Michael Wechner
Wyona - Open Source Content Management - Apache Lenya
http://www.wyona.com http://lenya.apache.org
michael.wechner@wyona.com michi@apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn questions
Posted by Jann Forrer <ja...@id.unizh.ch>.
On Wed, 15 Jun 2005, J. Wolfgang Kaltz wrote:
> Jann Forrer schrieb:
> >
> > I am a bit confused with the svn stuff.
>
> Welcome to the club
>
Thanks
> > --- tabs.jx (revision 190723)
> > +++ tabs.jx (working copy)
> >
> > -<!-- $Id: overview.jx 123960 2005-01-03 12:39:05Z andreas $ -->
> > +<!-- $Id$ -->
>
> This makes sense: your local copy does not have a new $Id$ yet, or to be
> more precise: it will be expanded when you commit (if the file has the
> appropriate property, see below)
>
Yes i understand that
> >
> > The website:
> > https://svn.apache.org/repos/asf/lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx
> > also shows andreas as the last author.
>
> If you look at
> http://svn.apache.org/viewcvs.cgi/lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx
> you will see the revisions.
>
> What I don't understand is why the content shows an obsolete $Id$ !?
>
Yes that is strange the file on the webseite shows another $Id$ than the
file i checked out?
[ .... ]
Thanks for your explanations.
Jann
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org
Re: svn questions
Posted by "J. Wolfgang Kaltz" <ka...@interactivesystems.info>.
Jann Forrer schrieb:
>
> I am a bit confused with the svn stuff.
Welcome to the club
> --- tabs.jx (revision 190723)
> +++ tabs.jx (working copy)
>
> -<!-- $Id: overview.jx 123960 2005-01-03 12:39:05Z andreas $ -->
> +<!-- $Id$ -->
This makes sense: your local copy does not have a new $Id$ yet, or to be
more precise: it will be expanded when you commit (if the file has the
appropriate property, see below)
>
> The website:
> https://svn.apache.org/repos/asf/lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx
> also shows andreas as the last author.
If you look at
http://svn.apache.org/viewcvs.cgi/lenya/trunk/src/webapp/lenya/usecases/admin/tabs.jx
you will see the revisions.
What I don't understand is why the content shows an obsolete $Id$ !?
>
> Why are the author the version and the date different?
>
>
> BTW how can i assure that <!-- $Id$ --> is expanded with the necessary
> informations (i.e. version, date, author)? Is this done by svn
> automatically?
It is only done automatically if the appropriate property is set:
svn propset svn:keywords "Id" <your-file>
Unfortunately, this property is not set by default. So if you create a
new file (or find one where this is not yet set), you need to set the
property and do svn commit (a property change is a change to the
repository, as is a content change)
In the case of the file you are referring to, the property is in fact set:
Doing
svn proplist --verbose src/webapp/lenya/usecases/admin/tabs.jx
returns
Properties on 'src/webapp/lenya/usecases/admin/tabs.jx':
svn:keywords : Id
When you commit your changes, "you" will be expanded in the $Id$. I am
not sure if this will show up in the contents of
http://svn.apache.org/viewcvs.cgi, but it will show up in the revision
log, and in the source of anybody checking it out.
--
Wolfgang
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lenya.apache.org
For additional commands, e-mail: dev-help@lenya.apache.org