Re: Log Keyword and Merge Conflict

[Greg A. Woods]

[ On Wednesday, April 25, 2001 at 14:11:01 (-0500), Valarie Flick wrote: ]
> Subject: Log Keyword and Merge Conflict
>
> My question is: has anyone figured out a way around this short of
> removing the $Log$ keyword?

It would only make sense to remove $Log from all your files.  Use of
$Log, even with bare RCS, can only provide a confusing duplicate and
possibly divergent source of information.  Furthermore if you use
branches the content of $Log can never be correct unless it's manually
merged with great care.

-- 
                                                        Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>     <address@hidden>
Planix, Inc. <address@hidden>;   Secrets of the Weird <address@hidden>