Re: [Springframework-developer] @since and @version tags

[<jer...@xt...>]

Colin Sampaleanu wrote:

> Dmitriy Kopylenko wrote:
>
>>
>>> I like id keywords...they're mainly in the code through my classes or
>>> classes I've edited... (Damn, if it's standardized, I won't know if 
>>> I've
>>> worked on a particular file any more :-)
>>>  
>>>
>> I also insert $Id:$ when I work on existing classes or create new 
>> ones ;-)
>>
>> Dmitriy.
>
>
> I personally like $Id tags. But they do suck big time when trying to 
> merge files back in after a branch, causing a conflict/change to exist 
> when there shouldn't be any... There seems to be a trend to going away 
> from using them in files, by some people, for this reason.

Simply use the "-kk" option.
Have a look at: http://www.loria.fr/~molli/cvs/doc/cvs_toc.html#TOC96
Keywords are not an issue at all for branches & merges.

Jérôme.