From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 20 20:58:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 924B716A420 for ; Mon, 20 Feb 2006 20:58:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD6C043D73 for ; Mon, 20 Feb 2006 20:58:23 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 9DFDC46B96 for ; Mon, 20 Feb 2006 15:58:07 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id CA82C63F33; Mon, 20 Feb 2006 20:57:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id B638A16A425; Mon, 20 Feb 2006 20:57:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2BD116A420; Mon, 20 Feb 2006 20:57:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44C8043D48; Mon, 20 Feb 2006 20:57:06 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost (john@localhost [127.0.0.1]) by server.baldwin.cx (8.13.4/8.13.4) with ESMTP id k1KKv4vR023823; Mon, 20 Feb 2006 15:57:04 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: D1ng0 Date: Mon, 20 Feb 2006 15:58:05 -0500 User-Agent: KMail/1.9.1 References: <200602191929.k1JJTN06063193@repoman.freebsd.org> <200602201359.35492.jhb@freebsd.org> <1140468339.799.9.camel@pavilion.optimlabs.com> In-Reply-To: <1140468339.799.9.camel@pavilion.optimlabs.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200602201558.07967.jhb@freebsd.org> X-Virus-Scanned: ClamAV 0.87.1/1293/Sun Feb 19 11:40:25 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=4.2 tests=ALL_TRUSTED,AWL autolearn=ham version=3.1.0 X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on server.baldwin.cx Cc: rwatson@freebsd.org, Scott Kamp , Perforce Change Reviews Subject: Re: PERFORCE change 92056 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Feb 2006 20:58:27 -0000 On Monday 20 February 2006 15:45, D1ng0 wrote: > > FYI, all the other TrustedBSD branches use 'trustedbsd_' as a prefix of > > their branch name: > > > > trustedbsd_acl > > trustedbsd_acl_nfsv4 > > trustedbsd_audit > > trustedbsd_audit2 > > trustedbsd_audit3 > > trustedbsd_audit3_old > > trustedbsd_audit3_openbsm_sys > > trustedbsd_cap > > trustedbsd_doc > > trustedbsd_dsep > > trustedbsd_mac > > trustedbsd_objlabel > > trustedbsd_openbsm_audit3 > > trustedbsd_sebsd > > trustedbsd_sedarwin > > > > If you were following that pattern you would use 'trustedbsd_sebsd2' > > rather than just 'sebsd2'. Also, all the other TrustedBSD branches are > > branched from the 'trustedbsd' base branch in > > //depot/projects/trustedbsd/base/... For example, the audit3 branch's > > view is: > > > > View: > > //depot/projects/trustedbsd/base/... > > //depot/projects/trustedbsd/audit3/... > > > > Wherease the sebsd2 branch's view is: > > > > View: > > //depot/vendor/freebsd/src/... > > //depot/projects/trustedbsd/sebsd2/... > > > > Is the inconsistency intentional? > > the trustedbsd_ branch name was an over sight, the branching > from //depot/vendor/freebsd/src/... instead > of //depot/projects/trustedbsd/base/... was due to a conversation > pertaining to pulling in audit to sebsd2 while working to bring it > current, referring to the specific email would be > > Subject: > Re: Migrating SeBSD to CUREENT - Are > we alive ??? > Date: > Thu, 16 Feb 2006 13:45:11 +0000 > (GMT) (21:45 PHT) > > where Robert stated it would be best to branch from vendor/freebsd or > even trustedbsd/mac to include the audit code, though mac is in an > untested state. So i went with vendor/src/... now as for the branch > name, how can we resolv that. I think Robert would probably prefer //depot/projects/trustedbsd/base/... It's basically a snapshot of //depot/vendor/freebsd/... I'll leave that to him to clarify. As far as the branch, you can just create a new trustedbsd_sebsd2 branch with the correct view and delete the old sebsd2 branch. Branches are just names for views in p4. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org