Re: Keyword corresponding to $log:$ in CVS

At 11:11 PM +0200 6/3/03, Branko âibej wrote:
>$Log$ is a total horror the moment you start merging changes between
>branches. You're practiallly guaranteed to get conflicts there, which --
>because of the nature of this keyword -- simply cannot be resolved
>automatically.

Oh dear. In *my* bikeshed, $Log$ is always
conflict-free and easily handled automatically,
because it's *always* generated, never preserved,
diffed, edited, or merged.

-- 
-==-
Jack Repenning
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94015
o: 650.228.2562
c: 408.835-8090
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org