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

Re: [BUG] Conflict with use-commit-times = yes + svn:keywords set

From: John Peacock <jpeacock_at_rowman.com>
Date: 2004-11-03 20:14:40 CET

Julian Foad wrote:

> Do you mean "check the text base at the time when svn:keywords becomes
> set", or "check the text base every time it is accessed while
> svn:keywords is set"?
> If the former, then this won't help with files that are already messed
> up in this way, unless we tell people to unset and then re-set
> svn:keywords.

The current way that the working copy file (not the text-base) gets
unexpanded is when the /file/ is changed and the svn:keywords property
is set. All I am suggesting is that when the svn:keywords property is
initially set, the code assume that the file /has/ changed and go
through the motions to unexpand the file and commit it, which should
have the effect of storing an unexpanded keyword in the repository.

> "revprop"? You mean the "svn:keywords" file property, I assume.

Yes, sloppy language on my part.

> How would the user go about fixing the file? We are talking about the
> base text, aren't we? All the user can do is perhaps modify the working
> copy in some way, if that is useful.

I just did this on the test file that I was using yesterday; I changed
the file thus forcing the unexpand code to fire (any textural change is
sufficient, BTW). It has to do with the fact that the svn:keywords code
is largely decoupled from the rest of the code base (to the extent that
the file is committed and only then is the text-base file expanded into
the working copy again), so it's hard to feedback from one to the other.

The trick is that we need to make sure that the commit doesn't complete
unless the user has used '--force' on the command line. Now that
Sussman has mentioned the 'svn:eol-style = native' code, I know where to
look for this...


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 Wed Nov 3 20:15:32 2004

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

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