From owner-p4-projects Tue Apr 16 14:43:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C470337B400; Tue, 16 Apr 2002 14:43:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by hub.freebsd.org (Postfix) with ESMTP id 4020437B417 for ; Tue, 16 Apr 2002 14:43:16 -0700 (PDT) Received: (qmail 19734 invoked from network); 16 Apr 2002 21:43:12 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail13.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 16 Apr 2002 21:43:12 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3GLhMv77996; Tue, 16 Apr 2002 17:43:22 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204161932.g3GJWfe80273@green.bikeshed.org> Date: Tue, 16 Apr 2002 17:42:16 -0400 (EDT) From: John Baldwin To: "Brian F. Feldman" Subject: Re: PERFORCE change 9842 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 16-Apr-2002 Brian F. Feldman wrote: > John Baldwin wrote: >> >> On 16-Apr-2002 Brian Feldman wrote: >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9842 >> > >> > Change 9842 by green@green_laptop_2 on 2002/04/16 12:17:25 >> > >> > #include where needed. >> > >> > Affected files ... >> > >> > ... //depot/projects/trustedbsd/mac/release/Makefile#10 edit >> > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#2 edit >> > >> > Differences ... >> > >> > ==== //depot/projects/trustedbsd/mac/release/Makefile#10 (text+ko) ==== >> > >> > @@ -273,7 +273,10 @@ >> > for i in ${BOOTSTRAPUTILS} ; do \ >> > cp -p ${CHROOTDIR}$$i ${CHROOTDIR}/${BOOTSTRAPDIR} ; \ >> > done >> > -.if !defined(RELEASETAG) >> > +.if defined(SRCROOTDIR) >> > + cd ${CHROOTDIR}/usr && rm -rf src && \ >> > + cp -Rp ${SRCROOTDIR}/ src >> > +.elif !defined(RELEASETAG) >> > cd ${CHROOTDIR}/usr && rm -rf src && \ >> > cvs -R -d ${CVSROOT} co -P ${RELEASESRCMODULE} >> > .else >> > >> >> This doesn't look like a #include. :) > > Yeah, "oops". I don't think I can do a forced commit, though;, maybe I > should just revert the change and recreate it? You can do a forced commit I think. p4 edit foo, p4 submit foo. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message