[jdev] Re: Use of $Id$ in source files

[Thomas Charron]

On Wednesday 22 December 2004 03:05 am, Neil Stevens wrote:
> On Tuesday 21 December 2004 08:24 am, Bresler, Jonathan wrote:
> > Folks,
> > These $Id$ make it much easier to discuss the files.
> > "see version 1.58 of jabberd14/jabberd/jabber.c"
> > Rather than, " the version checked into CVS on 2004-12-21 15:00"
> The idea makes merging harder because it adds unnecessary conflicts (as any
> two branches will have conflicts in the Id line), and isn't necessary to
> acheive your goal of knowing what version was checked out.  The sandbox

  Umm..  $Id$ does NOT add any additional conflicts.  It's a special text 
string that is actually stored and considered to be, $Id$, and NOT the string 
that the version represents.  The string presented is the one the sandbox 
considers it to be, and it allows the version information to be present in 
CVS exports for release builds and the such..