[Zope-Coders] cvs keyword expansion

[Godefroid Chapelle]

Hi all, I regularly have problems with the cvs keywords when using 
branches : I get files with garbage like the following

<<<<<<< Image.py
<<<<<<< Image.py
<<<<<<< Image.py
<<<<<<< Image.py
__version__='$Revision: 1.145.2.2 $'[11:-2]
=======
__version__='$Revision: 1.146 $'[11:-2]
 >>>>>>> 1.146
=======
__version__='$Revision: 1.146 $'[11:-2]
 >>>>>>> 1.146
=======
__version__='$Revision: 1.145.2.2 $'[11:-2]
 >>>>>>> 1.145.2.2
=======
__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.

I wonder if there is a standard way of using those keywords in CVS Zope 
tree.
If there is one, I would volunteer to correct the files not complying to 
this standard.

One of the question related to that is how often the __version__ pattern 
is needed or if could disappear.


-- 
Godefroid Chapelle

BubbleNet sprl
rue Victor Horta, 18 / 202
1348 Louvain-la-Neuve
Belgium

Tel + 32 (10) 459901

TVA 467 093 008
RC Niv 49849