[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Keyword corresponding to $log:$ in CVS

From: Jack Repenning <jrepenning_at_collab.net>
Date: 2003-06-05 18:32:29 CEST

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

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
Received on Thu Jun 5 18:33:13 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.