From owner-freebsd-stable@FreeBSD.ORG Sun Apr 6 18:02:12 2003 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A405537B401; Sun, 6 Apr 2003 18:02:12 -0700 (PDT) Received: from visar.norris-net.com (adsl-81-141-31.asm.bellsouth.net [65.81.141.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 831CC43F75; Sun, 6 Apr 2003 18:02:11 -0700 (PDT) (envelope-from derrick@visar.norris-net.com) Received: from visar.norris-net.com (derrick@localhost [127.0.0.1]) h3712BaL006757; Sun, 6 Apr 2003 21:02:12 -0400 (EDT) (envelope-from derrick@visar.norris-net.com) Received: from localhost (localhost [[UNIX: localhost]]) by visar.norris-net.com (8.12.8p1/8.12.8/Submit) id h3712BZp006756; Sun, 6 Apr 2003 21:02:11 -0400 (EDT) Content-Type: text/plain; charset="iso-8859-1" From: Derrick Norris Date: Sun, 6 Apr 2003 21:02:11 -0400 X-Mailer: KMail [version 1.4] To: freebsd-stable@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-Id: <200304062102.11187.derrick@norris-net.com> Subject: Re: 4.8R and $FreeBSD$ version tag expansion X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: derrick@norris-net.com List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Apr 2003 01:02:13 -0000 >>>>> "Bruce" == Bruce A Mah writes: Bruce> If memory serves me right, Julian Stacey wrote: >> > From: "David A. Gobeille" Date: >> > Fri, 04 Apr 2003 18:21:00 -0600 Message-id: >> > <3E8E216C.2060009@earthlink.net> >> >> "David A. Gobeille" wrote: >> > I noticed that there were quite a few files with version ids >> > of '$FreeBSD$' when I ran mergemaster after an install of >> > 4.8R. This isn't >> >> I read tags were reworked. Prob. you'r working from old >> sources, & It'll rectify if you wait a day & then { refresh >> your CVS tree & re-export src/ } or { if src/ from a .iso, >> check your MD5, & refetch from local mirror if old }, then >> remake. Bruce> I think I explained this in a prior posting to this list, but what happened was that the $FreeBSD$ CVS keywords didn't get expanded the first time we tried to build a release. mergemaster hates this, as the original poster discovered. For this and other reasons, we considered this a showstopper and rebuilt the release; when we did, we also needed to modify one file and slide its CVS tag. Bruce> Users updating from sources (e.g. using cvsup or anon CVS) were probably not affected by this. In confirmation, I updated from source on Apr 4 ~2pm EST and haven't seen any $FreeBSD$ ids in /etc/... ========== I noticed when I built release 4.8 from source (using the RELENG_4_8 tag) that I had many files in src/etc (and many other parts of src) with $FreeBSD$ ids. After reading this thread, I thought maybe there was bad timing with my cvsup, so I cvsupped again and checked just before sending this message. On my system, in both the RELENG_4_8 and RELENG_4_8_0_RELEASE tags, many of the files have the bad ids. Do I need to blow away my cvsupped src tree and bring it down again from scratch? --Derrick Norris