[Zope3-checkins] Re: [Zope-Checkins] Re: SVN: Zope3/trunk/ Ignorefiles/directories that are result of a build process, such

[Philipp von Weitershausen]

Tim Peters wrote:
> [Jim Fulton]
> 
>>...
>>In CVS. I recommend that people use -kk, which disables substitution,
>>to prevent spurious merge conflicts.  Subversion doesn't seem to have
>>such an option, so enabling $Id$ could cause major headaches for
>>merging.
> 
> 
> Has someone tried this?

Yes. I've done some pretty large mergins with svn and it indeed is smart 
about keywords. It's the way it should have been in CVS, too... ;)

>>>I like them too. :-) They give me a quick overview who and when the
>>>file was last modified.
> 
> 
>>Sure, but I doubt that this benefit is really worth the cost.
>>
>>I'm for saying good bye to $Id$.
> 
> I generally am too, but not always:  on occasion, and especially with
> Windows users, it's been valuable to have them fire up a Python shell and
> display the docstring for one of the BTree modules.  There's sometimes no
> other reasonably easy way to know exactly which version of the C code
> they're running.  So, e.g., that _OOBTree.__doc__ displays this right now:
> 
> """
> $Id: _OOBTree.c,v 1.4 2004/05/03 18:45:52 spascoe Exp $

Of course, svn isn't drilled yet to expand keywords in those .c files.

> is undesirable, and I'd rather teach SVN to expand $Id$ in these specific
> files than to remove this (now) nonsense from them.

You seem to have a good use case for $Id$ in compiled files. So, we 
could say that we generally do not use $Id$ except in .c files for the 
above stated reasons.

Philipp