You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by Will Glass-Husain <wg...@forio.com> on 2005/01/05 16:25:54 UTC
ID tag
Any source control experts out there?
In the commits I did this morning, the ID tag in the headers was changed.
For example:
+++
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
- * @version $Id: DataSourceResourceLoader.java,v 1.12 2004/03/20 03:35:51
dlr Exp $
+ * @version $Id$
But that wasn't in my patch. What happened? Is this a config issue on my
end or on the server?
WILL
_______________________________________
Forio Business Simulations
Will Glass-Husain
wglass@forio.com
www.forio.com
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: ID tag
Posted by "Henning P. Schmiedehausen" <hp...@intermeta.de>.
"Will Glass-Husain" <wg...@forio.com> writes:
>A little counterintuitive.
But the only way to get svn merge or svn diff to work without the
"diff nightmares" of CVS.
Regards
Henning
--
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen INTERMETA GmbH
hps@intermeta.de +49 9131 50 654 0 http://www.intermeta.de/
RedHat Certified Engineer -- Jakarta Turbine Development -- hero for hire
Linux, Java, perl, Solaris -- Consulting, Training, Development
What is more important to you...
[ ] Product Security
or [ ] Quality of Sales and Marketing Support
-- actual question from a Microsoft customer survey
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: ID tag
Posted by Will Glass-Husain <wg...@forio.com>.
Thanks, that explains it. When you view it on the web site:
http://svn.apache.org/viewcvs.cgi/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?rev=124215&view=markup
It shows the ID tag. But when you retrieve it with subversion it expands
it.
A little counterintuitive.
WILL
----- Original Message -----
From: "Shinobu Kawai" <sh...@gmail.com>
To: "Velocity Developers List" <ve...@jakarta.apache.org>
Sent: Wednesday, January 05, 2005 8:54 AM
Subject: Re: ID tag
> Hi Will,
>
>> I'm not sure if that clears anything up for me. I'd assumed that svn
>> would
>> expand ID like cvs. Is this not the case? (or did I do it wrong).
>
> It will to the files checked out on the client side. Here are the
> keywords you can use with Subversion:
> http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.4
>
> Here's what DataSourceResourceLoader.java looks like at my place:
> * @version $Id: DataSourceResourceLoader.java 124215 2005-01-05
> 14:56:50Z wglass $
>
> Best regards,
> -- Shinobu
>
> --
> Shinobu "Kawai" Yoshida <sh...@gmail.com>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: ID tag
Posted by Shinobu Kawai <sh...@gmail.com>.
Hi Will,
> I'm not sure if that clears anything up for me. I'd assumed that svn would
> expand ID like cvs. Is this not the case? (or did I do it wrong).
It will to the files checked out on the client side. Here are the
keywords you can use with Subversion:
http://svnbook.red-bean.com/en/1.1/ch07s02.html#svn-ch-7-sect-2.3.4
Here's what DataSourceResourceLoader.java looks like at my place:
* @version $Id: DataSourceResourceLoader.java 124215 2005-01-05
14:56:50Z wglass $
Best regards,
-- Shinobu
--
Shinobu "Kawai" Yoshida <sh...@gmail.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: ID tag
Posted by Will Glass-Husain <wg...@forio.com>.
Thanks,
I'm not sure if that clears anything up for me. I'd assumed that svn would
expand ID like cvs. Is this not the case? (or did I do it wrong).
Daniel, since you set up the subversion, any tips on this?
WILL
----- Original Message -----
From: "Shinobu Kawai" <sh...@gmail.com>
To: "Velocity Developers List" <ve...@jakarta.apache.org>
Sent: Wednesday, January 05, 2005 8:00 AM
Subject: Re: ID tag
> Hi Will,
>
>> Any source control experts out there?
>
> I'm not an expert, but...
>
>> In the commits I did this morning, the ID tag in the headers was changed.
>> For example:
>>
>> +++
>> jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
>> - * @version $Id: DataSourceResourceLoader.java,v 1.12 2004/03/20
>> 03:35:51
>> dlr Exp $
>> + * @version $Id$
>>
>> But that wasn't in my patch. What happened? Is this a config issue on
>> my
>> end or on the server?
>
> I think this is the expected behaviour. Subversion stores the files
> with the keywords unexpanded. The conversion tool used the CVS files
> as is (i.e. keywords expanded), creating the difference between the
> committed file.
> http://svnbook.red-bean.com/en/1.1/ch03s03.html#svn-ch-3-sect-3.2 (The
> Note)
> It shouldn't appear from the second commit.
>
> ## The same thing happened to all of my patches.
>
> Best regards,
> -- Shinobu
>
> --
> Shinobu "Kawai" Yoshida <sh...@gmail.com>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: ID tag
Posted by Shinobu Kawai <sh...@gmail.com>.
Hi Will,
> Any source control experts out there?
I'm not an expert, but...
> In the commits I did this morning, the ID tag in the headers was changed.
> For example:
>
> +++
> jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
> - * @version $Id: DataSourceResourceLoader.java,v 1.12 2004/03/20 03:35:51
> dlr Exp $
> + * @version $Id$
>
> But that wasn't in my patch. What happened? Is this a config issue on my
> end or on the server?
I think this is the expected behaviour. Subversion stores the files
with the keywords unexpanded. The conversion tool used the CVS files
as is (i.e. keywords expanded), creating the difference between the
committed file.
http://svnbook.red-bean.com/en/1.1/ch03s03.html#svn-ch-3-sect-3.2 (The Note)
It shouldn't appear from the second commit.
## The same thing happened to all of my patches.
Best regards,
-- Shinobu
--
Shinobu "Kawai" Yoshida <sh...@gmail.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: ID tag
Posted by "Henning P. Schmiedehausen" <hp...@intermeta.de>.
"Will Glass-Husain" <wg...@forio.com> writes:
>Any source control experts out there?
>In the commits I did this morning, the ID tag in the headers was changed.
>For example:
>+++
>jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
>- * @version $Id: DataSourceResourceLoader.java,v 1.12 2004/03/20 03:35:51
>dlr Exp $
>+ * @version $Id$
>But that wasn't in my patch. What happened? Is this a config issue on my
>end or on the server?
svn propget svn:keywords DataSourceResourceLoader.java
svn propset svn:keywords "Id Author" DataSourceResourceLoader.java
Regards
Henning
--
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen INTERMETA GmbH
hps@intermeta.de +49 9131 50 654 0 http://www.intermeta.de/
RedHat Certified Engineer -- Jakarta Turbine Development -- hero for hire
Linux, Java, perl, Solaris -- Consulting, Training, Development
What is more important to you...
[ ] Product Security
or [ ] Quality of Sales and Marketing Support
-- actual question from a Microsoft customer survey
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org