On 19/03/2012 11:05, Konstantin Kolinko wrote: > 2012/3/19 Konstantin Kolinko <knst.koli...@gmail.com>: >> 2012/3/19 Mark Thomas <ma...@apache.org>: >>> On 19/03/2012 10:25, ma...@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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
