From owner-freebsd-current Sun Aug 17 10:10:18 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id KAA09729 for current-outgoing; Sun, 17 Aug 1997 10:10:18 -0700 (PDT) Received: from bitbox.follo.net (bitbox.follo.net [194.198.43.36]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id KAA09718 for ; Sun, 17 Aug 1997 10:10:13 -0700 (PDT) Received: (from eivind@localhost) by bitbox.follo.net (8.8.6/8.8.6) id TAA19160; Sun, 17 Aug 1997 19:07:44 +0200 (MET DST) Date: Sun, 17 Aug 1997 19:07:44 +0200 (MET DST) Message-Id: <199708171707.TAA19160@bitbox.follo.net> From: Eivind Eklund To: Steve Passe CC: current@FreeBSD.ORG In-reply-to: Steve Passe's message of Sat, 16 Aug 1997 15:37:49 -0600 Subject: Re: damage in current to i386/isa/aic6360.c References: <199708162137.PAA02987@Ilsa.StevesCafe.com> Sender: owner-freebsd-current@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk > > Hi, > > I just cvsupped current and could not make depend for GENERIC: > > ../../i386/isa/aic6360.c:1311: unterminated macro call > ../../i386/isa/aic6360.c:2464: warning: preprocessing directive not recognized > > I looked at it and it is obviosly damaged. So I removed my local copy, > re-cvsupped, new copy came down, but it also is damaged. So I saved > my copy in my commit tree on freefall as aic6360.c.GOOD, then did a cvs update: [...] > It doesn't appear that there was a new commit, looks like file damage > in the CVS tree. This one is really scary. I looked it over, and the RCS file looked as it had the correct invariant; it was an RCS-file all right. However, on diffing a checkout from my local CVS-tree (which is valid) and this one, I find that the one on freefall contains code from CVS the program; part of src/contrib/cvs/src/commit.c, to be exact. I've restored the correct file on freefall from my local copy from a previous cvsup of the tree; no changes had been done afterwards. Eivind, slightly bending rules to (hopefully) benfit the project.