[cvsnt] $Log$ conflicts in CVSNT but NOT in Linux CVS - why?

[Tony Hoyle]

On Wed, 22 Oct 2003 17:52:31 +0200, Tom Cmok <tomcmok at free.polbox.pl>
wrote:

>Some time ago I asked about conflicts in the $Log$ part when CVSNT 
>merges two files changed simultaneously by several users. The answers 
>I got mostly was to forget using $Log$ etc. BUT: some older version 
>of CVSNT (<2) was not having this problem AND the current version 
>of original CVS does not have it as well. Is it really so difficult 
>to fix this bug?
>
Yes, because it requires a special case for $Log$.

You can't merge any $...$ keywords in Linux CVS except $Log$, and only
then because of the way it works (because it preserves its existing
contents by default).  Since $Log$ isn't that useful and merging the
other keywords is potentially much more useful, breaking that one case
is OK - it's personally saved me many hours of mucking around being
able to merge $Id$ for example.

Tony