From owner-cvs-all Tue Jul 11 4:20:17 2000 Delivered-To: cvs-all@freebsd.org Received: from gidora.zeta.org.au (gidora.zeta.org.au [203.26.10.25]) by hub.freebsd.org (Postfix) with SMTP id AA28F37C127 for ; Tue, 11 Jul 2000 04:19:55 -0700 (PDT) (envelope-from bde@zeta.org.au) Received: (qmail 26186 invoked from network); 11 Jul 2000 11:19:50 -0000 Received: from unknown (HELO bde.zeta.org.au) (203.2.228.102) by gidora.zeta.org.au with SMTP; 11 Jul 2000 11:19:50 -0000 Date: Tue, 11 Jul 2000 21:19:45 +1000 (EST) From: Bruce Evans X-Sender: bde@besplex.bde.org To: Wilfredo S=?iso-8859-1?q?=E1?=nchez Cc: cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org Subject: Re: cvs commit: src/usr.bin/make arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c make.c parse.c str.c suff.c targ.c util.c var.c In-Reply-To: <200007101750.KAA17323@scv2.apple.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN Content-Transfer-Encoding: QUOTED-PRINTABLE Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Mon, 10 Jul 2000, Wilfredo S[iso-8859-1] =E1nchez wrote: > | These files already used the standard FreeBSD style for ids. (The spac= e=20 > | saving is from deleting vendor sccsids which were carefully preserved.)= =20 > | =20 > | I don't like changing ids back and forth. Revs. 1.6, 1.7, 1.8, 1.10, 1= =2E11=20 > | and 1.12 of make/buf.c do nothing except change the ids. Rev. 1.9 chan= ges=20 > | the ids changes the ids and 2 other lines.=20 >=20 > Looks like the other changes were related to $Id$ vs. $FreeBSD$ keyword= s. I simply took the same strings and put them in the __RCSID() macro. I = also swapped the Berkely SCCS ID and the FreeBSD RCS/CVS ID so that the Fre= eBSD ID is in the binary and the Berkeley ID is in the comment. This seems= logical, since the Berkeley ID hasn't changed in a long time and probably = won't, even though the code has. The FreeBSD ID is the relevant one if som= eone is interested in inspecting a binary for it's current version info. [Please format paragraphs with somewhat less than 520 columns.] They were mostly related to _wrong_ $Id$ vs. $FreeBSD$ keyword changes, and the backing out of these ... :-). I don't want this history to be repeated= =2E History: Round 1: premature "long-awaited" change from $Id$ to $FreeBSD$ by jkh and backout of this change by peter. Affected most of the src tree. Round 2: (for make sources only; interleaved with round 3). Add $Id$. Get it wrong by duplicating $Id$, then remove one of the copies. Round 3: premature change from $Id$ to $FreeBSD$ by obrien in parts of contrib and/ir ports while core was still discussing the correct =09 format for the expansion of $FreeBSD$. Fait accompli. Change =09 completed by peter. End up with ugly (IMHO) formatting with =09 fairly full pathname of the file in the expansion of $FreeBSD. =09 I hope this round has not actually ended :-). Round 4: (for make sources only). Start using __RCSID(). Swapping the Berkeley Id into the comment makes the diffs relative to the Berkeley version harder to read. Bruce To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message