[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: Branko Čibej <brane_at_xbc.nu>
Date: 2003-06-06 03:46:13 CEST

Jack Repenning wrote:

> 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.

Wonderful. Now take two steps back and think about what it would mean to
always generate $Log$, and don't forget that log messages on committed
revisions can be changed. If I may suggest one topic for your
nightmares: how will "svn up" figure out that it has to regenerate $Log$
on some file because somebody changed the log message from three commits

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 6 03:44:58 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.