You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/03/19 11:25:26 UTC
svn commit: r1302359 - in /tomcat/trunk: bin/ conf/
java/javax/servlet/jsp/resources/ java/javax/servlet/resources/
Author: markt
Date: Mon Mar 19 10:25:25 2012
New Revision: 1302359
URL: http://svn.apache.org/viewvc?rev=1302359&view=rev
Log:
Correct some svn keyword placeholders
Modified:
tomcat/trunk/bin/catalina.bat
tomcat/trunk/bin/catalina.sh
tomcat/trunk/bin/configtest.bat
tomcat/trunk/bin/configtest.sh
tomcat/trunk/bin/cpappend.bat
tomcat/trunk/bin/digest.bat
tomcat/trunk/bin/digest.sh
tomcat/trunk/bin/service.bat
tomcat/trunk/bin/setclasspath.bat
tomcat/trunk/bin/setclasspath.sh
tomcat/trunk/bin/shutdown.bat
tomcat/trunk/bin/shutdown.sh
tomcat/trunk/bin/startup.bat
tomcat/trunk/bin/startup.sh
tomcat/trunk/bin/tool-wrapper.bat
tomcat/trunk/bin/tool-wrapper.sh
tomcat/trunk/bin/version.bat
tomcat/trunk/bin/version.sh
tomcat/trunk/conf/catalina.policy
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd
tomcat/trunk/java/javax/servlet/resources/datatypes.dtd
tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd
tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd
tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
Modified: tomcat/trunk/bin/catalina.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.bat (original)
+++ tomcat/trunk/bin/catalina.bat Mon Mar 19 10:25:25 2012
@@ -93,7 +93,7 @@ rem set TITLE=Tomcat.C
rem
rem
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
rem Suppress Terminate batch job on CTRL+C
Modified: tomcat/trunk/bin/catalina.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Mon Mar 19 10:25:25 2012
@@ -94,7 +94,7 @@
# Example (all one line)
# LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
#
-# $Id$
+# $Id:$
# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
Modified: tomcat/trunk/bin/configtest.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/configtest.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/configtest.bat (original)
+++ tomcat/trunk/bin/configtest.bat Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Configuration test script for the CATALINA Server
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
Modified: tomcat/trunk/bin/configtest.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/configtest.sh?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/configtest.sh (original)
+++ tomcat/trunk/bin/configtest.sh Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@
# -----------------------------------------------------------------------------
# Configuration Test Script for the CATALINA Server
#
-# $Id$
+# $Id:$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Modified: tomcat/trunk/bin/cpappend.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/cpappend.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/cpappend.bat (original)
+++ tomcat/trunk/bin/cpappend.bat Mon Mar 19 10:25:25 2012
@@ -17,7 +17,7 @@ rem limitations under the License.
rem ---------------------------------------------------------------------------
rem Append to CLASSPATH
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
rem Process the first argument
Modified: tomcat/trunk/bin/digest.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/digest.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/digest.bat (original)
+++ tomcat/trunk/bin/digest.bat Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Script to digest password using the algorithm specified
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
Modified: tomcat/trunk/bin/digest.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/digest.sh?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/digest.sh (original)
+++ tomcat/trunk/bin/digest.sh Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@
# -----------------------------------------------------------------------------
# Script to digest password using the algorithm specified
#
-# $Id$
+# $Id:$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Modified: tomcat/trunk/bin/service.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/service.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/service.bat (original)
+++ tomcat/trunk/bin/service.bat Mon Mar 19 10:25:25 2012
@@ -26,7 +26,7 @@ rem
rem name (optional) If the second argument is present it is considered
rem to be new service name
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
set "SELF=%~dp0%service.bat"
Modified: tomcat/trunk/bin/setclasspath.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/setclasspath.bat (original)
+++ tomcat/trunk/bin/setclasspath.bat Mon Mar 19 10:25:25 2012
@@ -19,7 +19,7 @@ rem Set JAVA_HOME or JRE_HOME if not alr
rem are valid and consistent with the selected start-up options and set up the
rem endorsed directory.
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
rem Make sure prerequisite environment variables are set
Modified: tomcat/trunk/bin/setclasspath.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/setclasspath.sh (original)
+++ tomcat/trunk/bin/setclasspath.sh Mon Mar 19 10:25:25 2012
@@ -20,7 +20,7 @@
# are valid and consistent with the selected start-up options and set up the
# endorsed directory.
#
-# $Id$
+# $Id:$
# -----------------------------------------------------------------------------
# Make sure prerequisite environment variables are set
Modified: tomcat/trunk/bin/shutdown.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/shutdown.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/shutdown.bat (original)
+++ tomcat/trunk/bin/shutdown.bat Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Stop script for the CATALINA Server
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
Modified: tomcat/trunk/bin/shutdown.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/shutdown.sh?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/shutdown.sh (original)
+++ tomcat/trunk/bin/shutdown.sh Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@
# -----------------------------------------------------------------------------
# Stop script for the CATALINA Server
#
-# $Id$
+# $Id:$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Modified: tomcat/trunk/bin/startup.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/startup.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/startup.bat (original)
+++ tomcat/trunk/bin/startup.bat Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Start script for the CATALINA Server
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
Modified: tomcat/trunk/bin/startup.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/startup.sh?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/startup.sh (original)
+++ tomcat/trunk/bin/startup.sh Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@
# -----------------------------------------------------------------------------
# Start Script for the CATALINA Server
#
-# $Id$
+# $Id:$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Modified: tomcat/trunk/bin/tool-wrapper.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/tool-wrapper.bat (original)
+++ tomcat/trunk/bin/tool-wrapper.bat Mon Mar 19 10:25:25 2012
@@ -39,7 +39,7 @@ rem created outside of
rem It can also be used to update the XML parser implementation.
rem Defaults to $CATALINA_HOME/endorsed.
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
Modified: tomcat/trunk/bin/tool-wrapper.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/tool-wrapper.sh?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/tool-wrapper.sh (original)
+++ tomcat/trunk/bin/tool-wrapper.sh Mon Mar 19 10:25:25 2012
@@ -39,7 +39,7 @@
# It can also be used to update the XML parser implementation.
# Defaults to $CATALINA_HOME/endorsed.
#
-# $Id$
+# $Id:$
# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
Modified: tomcat/trunk/bin/version.bat
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/version.bat?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/version.bat (original)
+++ tomcat/trunk/bin/version.bat Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@ if "%OS%" == "Windows_NT" setlocal
rem ---------------------------------------------------------------------------
rem Version script for the CATALINA Server
rem
-rem $Id$
+rem $Id:$
rem ---------------------------------------------------------------------------
rem Guess CATALINA_HOME if not defined
Modified: tomcat/trunk/bin/version.sh
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/version.sh?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/bin/version.sh (original)
+++ tomcat/trunk/bin/version.sh Mon Mar 19 10:25:25 2012
@@ -18,7 +18,7 @@
# -----------------------------------------------------------------------------
# Version Script for the CATALINA Server
#
-# $Id$
+# $Id:$
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
Modified: tomcat/trunk/conf/catalina.policy
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/catalina.policy?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/conf/catalina.policy (original)
+++ tomcat/trunk/conf/catalina.policy Mon Mar 19 10:25:25 2012
@@ -24,7 +24,7 @@
// * Read access to the web application's document root directory
// * Read, write and delete access to the web application's working directory
//
-// $Id$
+// $Id:$
// ============================================================================
Modified: tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd (original)
+++ tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd Mon Mar 19 10:25:25 2012
@@ -9,7 +9,7 @@
<xsd:annotation>
<xsd:documentation>
- $Id$
+ $Id:$
</xsd:documentation>
</xsd:annotation>
Modified: tomcat/trunk/java/javax/servlet/resources/datatypes.dtd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/datatypes.dtd?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
Binary files - no diff available.
Modified: tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_6.xsd Mon Mar 19 10:25:25 2012
@@ -8,7 +8,7 @@
<xsd:annotation>
<xsd:documentation>
- $Id$
+ $Id:$
</xsd:documentation>
</xsd:annotation>
Modified: tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_web_services_1_3.xsd Mon Mar 19 10:25:25 2012
@@ -9,7 +9,7 @@
<xsd:annotation>
<xsd:documentation>
- $Id$
+ $Id:$
</xsd:documentation>
</xsd:annotation>
Modified: tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd?rev=1302359&r1=1302358&r2=1302359&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_3.xsd Mon Mar 19 10:25:25 2012
@@ -9,7 +9,7 @@
<xsd:annotation>
<xsd:documentation>
- $Id$
+ $Id:$
</xsd:documentation>
</xsd:annotation>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1302359 - in /tomcat/trunk: bin/ conf/ java/javax/servlet/jsp/resources/
java/javax/servlet/resources/
Posted by Mark Thomas <ma...@apache.org>.
On 19/03/2012 11:05, Konstantin Kolinko wrote:
> 2012/3/19 Konstantin Kolinko <kn...@gmail.com>:
>> 2012/3/19 Mark Thomas <ma...@apache.org>:
>>> On 19/03/2012 10:25, markt@apache.org wrote:
>>>> Author: markt
>>>> Date: Mon Mar 19 10:25:25 2012
>>>> New Revision: 1302359
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1302359&view=rev
>>>> Log:
>>>> Correct some svn keyword placeholders
>>>
>>> Hmm. These changes should not have been necessary. The $KeywordName$
>>> should be sufficient.
>>>
>>> I'm not sure if this is gitsvn, the way I have configured WinMerge or
>>> something else.
>>>
>>> I'm going to hold off on further changes until I figure out what is
>>> going on.
>>>
>>
>> Just looked at one of those files (catalina.bat) before and after your commit,
>> in both cases "$Id$" expanded properly.
>>
>> Note, that svn "pristine" files (as stored on the server) do not have
>> keywords expanded. Expansion happens when svn client downloads the
>> file.
>>
>> E.g.
>> 1. opening this in a web browser
>> http://svn.apache.org/repos/asf/tomcat/trunk/bin/catalina.bat
>>
>> will show unexpanded keyword, and I would expect "$Id$" there, not "$Id:$".
>>
>> 2. displaying it with an svn client
>> svn cat http://svn.apache.org/repos/asf/tomcat/trunk/bin/catalina.bat
>>
>> will show expanded keyword.
>>
>
> I tested and there is drawback from using unexpected "$Id:$" instead
> of "$Id$" in the pristine file. It is the same as that git issue with
> broken line ends:
>
> If I touch "catalina.bat" then subsequent "svn status" command will
> show it as modified. That is because when file time differs svn has to
> compare file contents. Itun-expands keyword to be $Id$ before
> comparing the file with its pristine, and they do not match.
>
>
> How did you commit this revision? Via Git-svn?
Yes.
> I think that just touching the files and committing them with a svn
> client will undo your changes.
Reverting the commit should do it too.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1302359 - in /tomcat/trunk: bin/ conf/
java/javax/servlet/jsp/resources/ java/javax/servlet/resources/
Posted by Konstantin Kolinko <kn...@gmail.com>.
2012/3/19 Konstantin Kolinko <kn...@gmail.com>:
> 2012/3/19 Mark Thomas <ma...@apache.org>:
>> On 19/03/2012 10:25, markt@apache.org wrote:
>>> Author: markt
>>> Date: Mon Mar 19 10:25:25 2012
>>> New Revision: 1302359
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1302359&view=rev
>>> Log:
>>> Correct some svn keyword placeholders
>>
>> Hmm. These changes should not have been necessary. The $KeywordName$
>> should be sufficient.
>>
>> I'm not sure if this is gitsvn, the way I have configured WinMerge or
>> something else.
>>
>> I'm going to hold off on further changes until I figure out what is
>> going on.
>>
>
> Just looked at one of those files (catalina.bat) before and after your commit,
> in both cases "$Id$" expanded properly.
>
> Note, that svn "pristine" files (as stored on the server) do not have
> keywords expanded. Expansion happens when svn client downloads the
> file.
>
> E.g.
> 1. opening this in a web browser
> http://svn.apache.org/repos/asf/tomcat/trunk/bin/catalina.bat
>
> will show unexpanded keyword, and I would expect "$Id$" there, not "$Id:$".
>
> 2. displaying it with an svn client
> svn cat http://svn.apache.org/repos/asf/tomcat/trunk/bin/catalina.bat
>
> will show expanded keyword.
>
I tested and there is drawback from using unexpected "$Id:$" instead
of "$Id$" in the pristine file. It is the same as that git issue with
broken line ends:
If I touch "catalina.bat" then subsequent "svn status" command will
show it as modified. That is because when file time differs svn has to
compare file contents. Itun-expands keyword to be $Id$ before
comparing the file with its pristine, and they do not match.
How did you commit this revision? Via Git-svn?
I think that just touching the files and committing them with a svn
client will undo your changes.
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1302359 - in /tomcat/trunk: bin/ conf/ java/javax/servlet/jsp/resources/
java/javax/servlet/resources/
Posted by Mark Thomas <ma...@apache.org>.
On 19/03/2012 10:58, Konstantin Kolinko wrote:
> 2012/3/19 Mark Thomas <ma...@apache.org>:
>> On 19/03/2012 10:25, markt@apache.org wrote:
>>> Author: markt
>>> Date: Mon Mar 19 10:25:25 2012
>>> New Revision: 1302359
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1302359&view=rev
>>> Log:
>>> Correct some svn keyword placeholders
>>
>> Hmm. These changes should not have been necessary. The $KeywordName$
>> should be sufficient.
>>
>> I'm not sure if this is gitsvn, the way I have configured WinMerge or
>> something else.
>>
>> I'm going to hold off on further changes until I figure out what is
>> going on.
>>
>
> Just looked at one of those files (catalina.bat) before and after your commit,
> in both cases "$Id$" expanded properly.
>
> Note, that svn "pristine" files (as stored on the server) do not have
> keywords expanded. Expansion happens when svn client downloads the
> file.
I know. It looks as if at some point I had an svn client that failed to
expand the keywords. I spotted the differences when checking the diff
between 7.0.x/trunk and trunk (both svn checkouts).
Deleting my working copy and redoing the checkout appears to have
resolved the problem.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1302359 - in /tomcat/trunk: bin/ conf/
java/javax/servlet/jsp/resources/ java/javax/servlet/resources/
Posted by Konstantin Kolinko <kn...@gmail.com>.
2012/3/19 Mark Thomas <ma...@apache.org>:
> On 19/03/2012 10:25, markt@apache.org wrote:
>> Author: markt
>> Date: Mon Mar 19 10:25:25 2012
>> New Revision: 1302359
>>
>> URL: http://svn.apache.org/viewvc?rev=1302359&view=rev
>> Log:
>> Correct some svn keyword placeholders
>
> Hmm. These changes should not have been necessary. The $KeywordName$
> should be sufficient.
>
> I'm not sure if this is gitsvn, the way I have configured WinMerge or
> something else.
>
> I'm going to hold off on further changes until I figure out what is
> going on.
>
Just looked at one of those files (catalina.bat) before and after your commit,
in both cases "$Id$" expanded properly.
Note, that svn "pristine" files (as stored on the server) do not have
keywords expanded. Expansion happens when svn client downloads the
file.
E.g.
1. opening this in a web browser
http://svn.apache.org/repos/asf/tomcat/trunk/bin/catalina.bat
will show unexpanded keyword, and I would expect "$Id$" there, not "$Id:$".
2. displaying it with an svn client
svn cat http://svn.apache.org/repos/asf/tomcat/trunk/bin/catalina.bat
will show expanded keyword.
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1302359 - in /tomcat/trunk: bin/ conf/ java/javax/servlet/jsp/resources/
java/javax/servlet/resources/
Posted by Mark Thomas <ma...@apache.org>.
On 19/03/2012 10:25, markt@apache.org wrote:
> Author: markt
> Date: Mon Mar 19 10:25:25 2012
> New Revision: 1302359
>
> URL: http://svn.apache.org/viewvc?rev=1302359&view=rev
> Log:
> Correct some svn keyword placeholders
Hmm. These changes should not have been necessary. The $KeywordName$
should be sufficient.
I'm not sure if this is gitsvn, the way I have configured WinMerge or
something else.
I'm going to hold off on further changes until I figure out what is
going on.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org