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

Re: Possible bug in keyword replacement (revisited, with examples)

From: John Peacock <jpeacock_at_rowman.com>
Date: 2004-04-07 23:02:29 CEST

David Budworth wrote:

> basic summary: If you turn on keyword substitution for 'Id', and add
> the tag to your file as
> $Id:$ (as in, the way CVS requires, therefore coded in many template
> classes for us)
> You will get diffs and conflicting merge updates on the $Id$ tag itself.
> It appears that it gets stored in the repo as $Id:$, but when doing a
> diff, the client strips it down to $Id$ and sees it as a conflicting
> change.
> Note: purely adding a space after the colon "$Id: $" makes this go away,
> as well as leaving the colon out all together.

This is mostly driver error (but the code could be improved to throw an error).
  None of the special svn:keywords can include a colon between the $'s in the
repository (CVS behavior notwithstanding). The only time a colon (and trailing
space and additional text) will appear is when the keyword is expanded by the
client and then only in the WC. I think that there is some code which should
realize that this is not an expanded keyword (even though it looks like one),
but it may be failing.

It would appear that the diff code is treating it as an expanded keyword and
collapsing it in error. I would be curious whether the client expands it at all
when svn:keywords is set. It may be that only the diff code needs to be fixed.
  I'll take a look tonight if I get a chance (since I am working on replacing
the existing svn:keywords code anyways).


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: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 7 23:02:48 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.