[Zope-Coders] cvs keyword expansion

[Casey Duncan]

On Friday 19 September 2003 07:28 am, Magnus Heino wrote:
> > =======
> > __version__='$Revision: 1.146 $'[11:-2]
> >
> >  >>>>>>> 1.146
> >
> > As I do not have the problem with every files, I assume this is not due
> > to a misuse on my side. Anyway, I do not understand what causes those
> > problems.
> 
> That line has changed both in your banch, and in HEAD.
> 
> Merge with -kk
> 
> http://www.cvshome.org/docs/manual/cvs-1.12.1/cvs_12.html#SEC102

Also, for some inexplicable reason, $Id:$ seems far less prone to conflicts 
then $Revision:$. Feel free to remove the __version__ lines and replace them 
with an $Id:$ in the doc string for the module. AFAIK nobody uses or cares 
about the __version__ module globals, they are something of a (minor) wart 
IMO.

-Casey