[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: Brian W. Fitzpatrick <fitz_at_collab.net>
Date: 2004-11-02 18:56:09 CET

On Nov 2, 2004, at 11:07 AM, John Peacock wrote:

> Brian W. Fitzpatrick wrote:
>
>> I've seen this before. It's because in the conversion, the keywords
>> are expanded and stored expanded in the repository. Subversion isn't
>> used to seeing a keyword come out of the repository already expanded,
>> and seems to get confused when it attempts to diff between the
>> text-base and the file in the working copy.
>> I'm not sure what the real solution is here...
>
> The two possible solutions would seem to be:
>
> 1) cvs2svn doesn't store the expanded keywords in the first place;

Unfortunately, since CVS stores the keywords expanded, and they do
contain data that could be important to people, I don't think that this
is an option. Perhaps another switch could be added to do this, but I
don't think it should be the default.

However, perhaps we could add a feature to cvs2svn that does one final
commit to keyword-enabled files to unexpand the keywords. Dunno if
it's worth it tho.

> 2) Subversion is patched to unexpand keywords when checking out a file
> (since it already handles diff against an unexpanded text-base).
>
> I'm inclined to think that #1 is the most appropriate solution (on the
> GIGO principle), but #2 is probably not /that/ hard to do (having
> spent some time in that section of the code).

Hmm. I don't know if it's worth it though.

-Fitz

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 2 18:56:56 2004

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