[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 17:55:39 CET

On Nov 2, 2004, at 10:43 AM, Ben Collins-Sussman wrote:

>
> On Nov 1, 2004, at 8:13 PM, Řyvind A. Holm wrote:
>>
>> One thing I'd add is that it's only files which contains a keyword
>> that
>> get into a state of conflict. In the case of irssi, the only files
>> with
>> keywords are /trunk/scripts/mail.pl and /trunk/irssi.spec.in , and
>> both
>> of these creates a conflict.
>>
>
> Forget about the conflict. There's something fishier here. After
> setting 'use-commit-times = yes', do a checkout of the irssi trunk.
> 'svn status' and 'svn diff' show local mods on the virgin working
> copy!
>
> cvs2svn people: any idea what's going on here?

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...

-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 17:56:01 2004

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