Stephen Lau <[EMAIL PROTECTED]> writes: > I just wanted to start a discussion on what format we want to use for > keywords in ON. Currently, the #ident we use is something akin to: > > # ident "%Z%%M% %I% %E% SMI" > > which expands out to something like: > > # ident "@(#)Makefile.master 1.204 06/04/13 SMI" > > Currently, I've got a Mercurial python hook that will expand $Id$ to > something like: > > $Id: fubar 9f7070beca6e 2006-05-23 stevel $ > > so my proposal is to adopt a #ident syntax of: > > # ident $Id$ SMI. > > What do people think of this? It's easy enough to change the format, > I'd just like to start getting this settled as its one of the points > we'll need to address in the conversion from Teamware to Mercurial. > > I prefer the $Id$ syntax, since it's also supported under Subversion. >
Agreed, it's better to be consistent. The date section will need to be UTC to have any coherent meaning, since keywords will be expanded pre-commit rather than on checkout as now, which raises the possibility of them being spread between a variety of timezones. It would be nice if they could be unexpanded for the purposes of merging (doable with a snippet of code wrapping the merge program, if there's no hook it can be done in), since this should remove the spurious conflict of both parties changes having updated the ident. -- Rich. _______________________________________________ tools-discuss mailing list tools-discuss@opensolaris.org
