You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Niall Pemberton <ni...@blueyonder.co.uk> on 2005/02/14 02:52:49 UTC
[Subversion] Revision Keyword
When Struts moved from CVS to Subversion we changed $Revision$ keyword to
$Rev$ which gets replaced with the Revision number.
I just did this in Commons Validator but $Rev$ seems to be ignored (Changing
$Header$ to $Id$ seems fine). Is the revision number just not available as a
keyword in Commons or should I be using something else - or is it working
for others and must be something to do with my config?
Niall
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Steve Cohen <sc...@javactivity.org>.
Simon Kitching wrote:
>
> And you can get subversion commands to ignore certain files by setting
> the global-ignores entry in ~/.subversion/config. I have the following:
> [miscellany]
> global-ignores = *.o *.lo *.la .*~ *~ .#* *.class .*.marks
>
>
I believe it's much safer in the long run to do this in the repository
folder properties than relying on client-side configuration (although
it's probably best to do the first and recommend the second to all users).
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Dion Gillard <di...@gmail.com>.
Yep, that's it.
Thanks.
On Mon, 14 Feb 2005 14:07:39 +1100, Brett Porter <br...@apache.org> wrote:
> Given that it uses the same libraries as the native Subversion client
> build, it is most likely:
>
> c:\documents and settings\<USER>\Application Data\Subversion\config
>
> or something like that - it may not be in Application Data. You should
> be able to find it from your "home" directory.
>
> On Unix/cygwin subversion: ~/.subversion/config
>
> Cheers,
> Brett
>
> Dion Gillard wrote:
>
> >Any hints for a Subclipse user where the 'default config location' is?
> >
> >
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>
>
--
http://www.multitask.com.au/people/dion/
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Brett Porter <br...@apache.org>.
Given that it uses the same libraries as the native Subversion client
build, it is most likely:
c:\documents and settings\<USER>\Application Data\Subversion\config
or something like that - it may not be in Application Data. You should
be able to find it from your "home" directory.
On Unix/cygwin subversion: ~/.subversion/config
Cheers,
Brett
Dion Gillard wrote:
>Any hints for a Subclipse user where the 'default config location' is?
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Dion Gillard <di...@gmail.com>.
Any hints for a Subclipse user where the 'default config location' is?
On Mon, 14 Feb 2005 16:07:24 +1300, Simon Kitching <sk...@apache.org> wrote:
> Just to expand on Brett's reply:
>
> Keywords in subversion files are not expanded unless that file has the
> keyword-name in the svn:keywords property associated with that file. The
> svn:keywords property can be set using:
> svn propset svn:keywords "Id Rev ...." filename
> svn commit filename
> I presume you can update multiple files at the same time; I just haven't
> tried
>
> You can automatically ensure the svn:keywords property gets set on files
> you add to subversion by editing your ~/.subversion/config file:
> [miscellany]
> enable-auto-props = yes
> [auto-props]
> *.java = svn:keywords=Id Rev
>
> And you can get subversion commands to ignore certain files by setting
> the global-ignores entry in ~/.subversion/config. I have the following:
> [miscellany]
> global-ignores = *.o *.lo *.la .*~ *~ .#* *.class .*.marks
>
> Subversion keywords are described in the subversion documentation:
> http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.4
>
> Regards,
>
> Simon
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>
>
--
http://www.multitask.com.au/people/dion/
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Simon Kitching <sk...@apache.org>.
Just to expand on Brett's reply:
Keywords in subversion files are not expanded unless that file has the
keyword-name in the svn:keywords property associated with that file. The
svn:keywords property can be set using:
svn propset svn:keywords "Id Rev ...." filename
svn commit filename
I presume you can update multiple files at the same time; I just haven't
tried
You can automatically ensure the svn:keywords property gets set on files
you add to subversion by editing your ~/.subversion/config file:
[miscellany]
enable-auto-props = yes
[auto-props]
*.java = svn:keywords=Id Rev
And you can get subversion commands to ignore certain files by setting
the global-ignores entry in ~/.subversion/config. I have the following:
[miscellany]
global-ignores = *.o *.lo *.la .*~ *~ .#* *.class .*.marks
Subversion keywords are described in the subversion documentation:
http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.4
Regards,
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Niall Pemberton <ni...@blueyonder.co.uk>.
Thanks for your response. I'm using TortoiseSVN Version 1.1.3 - which is the
latest and is supposed to equate to Subversion 1.1. I've asked about
Revision on the ToirtoiseSVN web site.
Having said that, I still not convinced its an issue at my end, since I've
yet to see a project in Commons where its working - many commons projects
are not using revision but I found a few recent commits on files that use
it:
Betwixt - http://svn.apache.org/viewcvs.cgi?rev=154190&view=rev
Configuration - http://svn.apache.org/viewcvs.cgi?rev=153757&view=rev
DBCP - http://svn.apache.org/viewcvs.cgi?rev=153468&view=rev
Niall
----- Original Message -----
From: "Phil Steitz" <ph...@steitz.com>
Sent: Saturday, February 19, 2005 3:23 AM
> Niall Pemberton wrote:
> > Looks to me like "Revision" isn't a valid keyword.
> >
> > I added "Revision" to the list of keywords in my auto-props so that it
now
> > looks like this:
> > *.java = svn:eol-style=native;svn:keywords=date author id rev
revision
> >
> > I've just changed some BeanUtils java source files (which have Revision
> > listed in their "svn:keywords" property) and $Revision$ still didn't get
> > expanded.
> >
> > Rev works just fine, but Revision doesn't. The subversion conversion has
set
> > "Revision" in the svn:keywords on every file. Is there some way to get
> > Revision to work, or do we need to change everything to use Rev?
>
> I had this problem before I upgraded my svn client. IIUC, the client
> does the expansion and support for this keyword was not present in
> subversion 1.0.
>
> Phil
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Phil Steitz <ph...@steitz.com>.
Niall Pemberton wrote:
> Looks to me like "Revision" isn't a valid keyword.
>
> I added "Revision" to the list of keywords in my auto-props so that it now
> looks like this:
> *.java = svn:eol-style=native;svn:keywords=date author id rev revision
>
> I've just changed some BeanUtils java source files (which have Revision
> listed in their "svn:keywords" property) and $Revision$ still didn't get
> expanded.
>
> Rev works just fine, but Revision doesn't. The subversion conversion has set
> "Revision" in the svn:keywords on every file. Is there some way to get
> Revision to work, or do we need to change everything to use Rev?
I had this problem before I upgraded my svn client. IIUC, the client
does the expansion and support for this keyword was not present in
subversion 1.0.
Phil
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword - More Info
Posted by Niall Pemberton <ni...@blueyonder.co.uk>.
Apparently the full form of the svn:keywords are case-sensitive, i.e...
LastChangedDate, LastChangedRevision, LastChangedBy
... but the short forms are case-insenstive, i.e....
Date, Rev, Author
... however "Revision" is a "medium form" and is case-sensitive.
http://svn.haxx.se/dev/archive-2005-02/0172.shtml
The problem is that the Commons Subversion conversion set the svn:keywords
to "revision" rather than "Revision" and so it gets ignored. Looks like all
the svn:keywords need updating for everything.
Niall
----- Original Message -----
From: "Niall Pemberton" <ni...@blueyonder.co.uk>
Sent: Friday, February 18, 2005 9:54 PM
Subject: Re: [Subversion] Revision Keyword
> Looks to me like "Revision" isn't a valid keyword.
>
> I added "Revision" to the list of keywords in my auto-props so that it now
> looks like this:
> *.java = svn:eol-style=native;svn:keywords=date author id rev revision
>
> I've just changed some BeanUtils java source files (which have Revision
> listed in their "svn:keywords" property) and $Revision$ still didn't get
> expanded.
>
> Rev works just fine, but Revision doesn't. The subversion conversion has
set
> "Revision" in the svn:keywords on every file. Is there some way to get
> Revision to work, or do we need to change everything to use Rev?
>
> Niall
>
> ----- Original Message -----
> From: "Brett Porter" <br...@apache.org>
> Sent: Monday, February 14, 2005 2:20 AM
>
>
> > that's probably a good idea, though as I understand it they are
> synonymous.
> >
> > - Brett
> >
> > Niall Pemberton wrote:
> >
> > >----- Original Message -----
> > >From: "Brett Porter" <br...@apache.org>
> > >
> > >
> > >
> > >>Yep, it does, but you can use auto-props in your subversion
> > >>configuration (some defaults for svn:eol-style are in the
> > >>version-control document:
> http://www.apache.org/dev/version-control.html).
> > >>
> > >>I have this:
> > >>*.java = svn:eol-style=native;svn:keywords="Author Date Id Revision"
> > >>
> > >>
> > >
> > >I configured auto-props when Struts moved to Subversion, but in the
> struts
> > >conversion all the .java files were changed from using $Revision$ to
> $Rev$
> > >and my auto-props is configured as follows....
> > >
> > >*.java = svn:eol-style=native;svn:keywords=date author id rev
> > >
> > >I just went through changing Commons Validator from $Revision$ to
$Rev$ -
> > >does that mean I need to change them back? Shouldn't the keywords be
> > >consistent accross all Apache Subversion?
> > >
> > >Niall
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Niall Pemberton <ni...@blueyonder.co.uk>.
Looks to me like "Revision" isn't a valid keyword.
I added "Revision" to the list of keywords in my auto-props so that it now
looks like this:
*.java = svn:eol-style=native;svn:keywords=date author id rev revision
I've just changed some BeanUtils java source files (which have Revision
listed in their "svn:keywords" property) and $Revision$ still didn't get
expanded.
Rev works just fine, but Revision doesn't. The subversion conversion has set
"Revision" in the svn:keywords on every file. Is there some way to get
Revision to work, or do we need to change everything to use Rev?
Niall
----- Original Message -----
From: "Brett Porter" <br...@apache.org>
Sent: Monday, February 14, 2005 2:20 AM
> that's probably a good idea, though as I understand it they are
synonymous.
>
> - Brett
>
> Niall Pemberton wrote:
>
> >----- Original Message -----
> >From: "Brett Porter" <br...@apache.org>
> >
> >
> >
> >>Yep, it does, but you can use auto-props in your subversion
> >>configuration (some defaults for svn:eol-style are in the
> >>version-control document:
http://www.apache.org/dev/version-control.html).
> >>
> >>I have this:
> >>*.java = svn:eol-style=native;svn:keywords="Author Date Id Revision"
> >>
> >>
> >
> >I configured auto-props when Struts moved to Subversion, but in the
struts
> >conversion all the .java files were changed from using $Revision$ to
$Rev$
> >and my auto-props is configured as follows....
> >
> >*.java = svn:eol-style=native;svn:keywords=date author id rev
> >
> >I just went through changing Commons Validator from $Revision$ to $Rev$ -
> >does that mean I need to change them back? Shouldn't the keywords be
> >consistent accross all Apache Subversion?
> >
> >Niall
> >
> >
> >
> >---------------------------------------------------------------------
> >To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> >For additional commands, e-mail: commons-dev-help@jakarta.apache.org
> >
> >
> >
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Brett Porter <br...@apache.org>.
that's probably a good idea, though as I understand it they are synonymous.
- Brett
Niall Pemberton wrote:
>----- Original Message -----
>From: "Brett Porter" <br...@apache.org>
>
>
>
>>Yep, it does, but you can use auto-props in your subversion
>>configuration (some defaults for svn:eol-style are in the
>>version-control document: http://www.apache.org/dev/version-control.html).
>>
>>I have this:
>>*.java = svn:eol-style=native;svn:keywords="Author Date Id Revision"
>>
>>
>
>I configured auto-props when Struts moved to Subversion, but in the struts
>conversion all the .java files were changed from using $Revision$ to $Rev$
>and my auto-props is configured as follows....
>
>*.java = svn:eol-style=native;svn:keywords=date author id rev
>
>I just went through changing Commons Validator from $Revision$ to $Rev$ -
>does that mean I need to change them back? Shouldn't the keywords be
>consistent accross all Apache Subversion?
>
>Niall
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
>For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Niall Pemberton <ni...@blueyonder.co.uk>.
----- Original Message -----
From: "Brett Porter" <br...@apache.org>
> Yep, it does, but you can use auto-props in your subversion
> configuration (some defaults for svn:eol-style are in the
> version-control document: http://www.apache.org/dev/version-control.html).
>
> I have this:
> *.java = svn:eol-style=native;svn:keywords="Author Date Id Revision"
I configured auto-props when Struts moved to Subversion, but in the struts
conversion all the .java files were changed from using $Revision$ to $Rev$
and my auto-props is configured as follows....
*.java = svn:eol-style=native;svn:keywords=date author id rev
I just went through changing Commons Validator from $Revision$ to $Rev$ -
does that mean I need to change them back? Shouldn't the keywords be
consistent accross all Apache Subversion?
Niall
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Brett Porter <br...@apache.org>.
Henri Yandell wrote:
>I think it's something you have to set on the svn partition in question.
>
>
It's a property.
>Unsure exactly how though, seems poor if each new directory would need
>it to be set.
>
>
Yep, it does, but you can use auto-props in your subversion
configuration (some defaults for svn:eol-style are in the
version-control document: http://www.apache.org/dev/version-control.html).
I have this:
*.java = svn:eol-style=native;svn:keywords="Author Date Id Revision"
This only applies to new files - you'll need to edit the properties for
existing ones to add svn:keywords
>I'm sure others know though, and when they answer I'd like to ask how
>we do .cvsignore too :)
>
>
svn propedit svn:ignore .
Again, applies only to the current directory.
The SVN Red book has some useful information on properties - the chapter
is well worth a read.
Cheers,
Brett
>Hen
>
>On Mon, 14 Feb 2005 01:52:49 -0000, Niall Pemberton
><ni...@blueyonder.co.uk> wrote:
>
>
>>When Struts moved from CVS to Subversion we changed $Revision$ keyword to
>>$Rev$ which gets replaced with the Revision number.
>>
>>I just did this in Commons Validator but $Rev$ seems to be ignored (Changing
>>$Header$ to $Id$ seems fine). Is the revision number just not available as a
>>keyword in Commons or should I be using something else - or is it working
>>for others and must be something to do with my config?
>>
>>Niall
>>
>>---------------------------------------------------------------------
>>To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
>>For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>>
>>
>>
>>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
>For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org
Re: [Subversion] Revision Keyword
Posted by Henri Yandell <fl...@gmail.com>.
I think it's something you have to set on the svn partition in question.
Unsure exactly how though, seems poor if each new directory would need
it to be set.
I'm sure others know though, and when they answer I'd like to ask how
we do .cvsignore too :)
Hen
On Mon, 14 Feb 2005 01:52:49 -0000, Niall Pemberton
<ni...@blueyonder.co.uk> wrote:
> When Struts moved from CVS to Subversion we changed $Revision$ keyword to
> $Rev$ which gets replaced with the Revision number.
>
> I just did this in Commons Validator but $Rev$ seems to be ignored (Changing
> $Header$ to $Id$ seems fine). Is the revision number just not available as a
> keyword in Commons or should I be using something else - or is it working
> for others and must be something to do with my config?
>
> Niall
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: commons-dev-help@jakarta.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org