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

[Tim Peters]

[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?  I'm not sure it matters under svn:  the "pristine
copies" stored in the .svn directories don't have keywords expanded (or eol
translations performed).  So, e.g., the "Keywords and Spurious Differences"
section of the svn docs say

    While checking for local modifications during svn diff, and before
    transmitting those local modifications during svn commit, Subversion
    “un-substitutes” any keywords that it previously substituted.  The
    result is that the versions of the file that are stored in the
    repository contain only the real modifications that users make to
    the file.

So it seems possible svn is smart enough not to *need* a -kk switch (for its
own purposes, like merges; non-svn diff tools applied to working copies
would of course see the expansions).

[Stephan Richter]
>> 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 $
$Id: BTreeItemsTemplate.c,v 1.20 2003/11/28 16:44:44 jim Exp $
$Id: BTreeModuleTemplate.c,v 1.40 2004/02/21 12:28:52 jim Exp $
$Id: BTreeTemplate.c,v 1.75 2003/11/28 16:44:44 jim Exp $
$Id: BucketTemplate.c,v 1.55 2003/11/28 16:44:44 jim Exp $
$Id: objectkeymacros.h,v 1.4 2002/06/27 00:32:54 tim_one Exp $
$Id: MergeTemplate.c,v 1.17 2003/11/28 16:44:44 jim Exp $
$Id: SetOpTemplate.c,v 1.30 2003/11/28 16:44:44 jim Exp $
$Id: SetTemplate.c,v 1.17 2003/11/28 16:44:44 jim Exp $
$Id: TreeSetTemplate.c,v 1.16 2003/11/28 16:44:44 jim Exp $
$Id: objectvaluemacros.h,v 1.4 2002/06/27 00:32:54 tim_one Exp $
$Id: BTreeItemsTemplate.c,v 1.20 2003/11/28 16:44:44 jim Exp $
"""

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