[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: bug: on update of svn:keywords, old value is not used to un-apply old keywords before attempted merging

From: John Peacock <jpeacock_at_rowman.com>
Date: 2005-09-30 15:03:10 CEST

Vincent Starre wrote:
> If I start with a file containing $Id$, with svn:keywords of Id, then
> change that to $Revision$ with svn:keywords of Revision, the new value
> of svn:keywords is used to un-expand the keywords in the file before
> attempted merging.

Hmmm, this is bug in the sense that it may cause confusion during
merges, but it is correct in the sense that the basic design of keyword
expansion specifically permits "freezing" an expanded keyword by
removing that entry in svn:keywords. Once you remove the entry from
svn:keywords, that keyword text is no longer considered special in any
way; it is now just a string of text. I cannot think offhand why this
would be /useful/, but there it is.

I think the appropriate fix is to add documentation emphasizing that if
you remove a keyword entry from svn:keywords, any existing expanded
keywords in the source files will not be unexpanded and that this could
cause problems with merging later.

John

-- 
John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 30 15:04:04 2005

This is an archived mail posted to the Subversion Dev mailing list.