From owner-p4-projects Sat Apr 20 7:18:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5396837B405; Sat, 20 Apr 2002 07:18:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id C439F37B400 for ; Sat, 20 Apr 2002 07:18:18 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g3KEI5w85674; Sat, 20 Apr 2002 10:18:05 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Sat, 20 Apr 2002 10:18:05 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Dag-Erling Smorgrav Cc: Perforce Change Reviews Subject: Re: PERFORCE change 9995 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII 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 19 Apr 2002, Dag-Erling Smorgrav wrote: > Robert Watson writes: > > During integ, lost the definition of chunksize. extattrctl still > > doesn't build due to unresolved issues merging DES's main-tree > > optimization and green's trustedbsd_mac optimization, which > > (unfortunately) accomplish the optimization in a way that doesn't > > merge easily. > > I sent you a patch a couple of weeks before I committed that, but didn't > get a reply... Neither change is necessarily bad -- they just conflict, since they're in different branches, and I just integ'd the tree such that they appeared in the same branch. One thing that does need to happen is that non-MAC-specific changes need to be made less in the MAC branch, since that's caused a number of conflicts and multi-hour merges. General changes, and in particular style changes to existing code, should be made in the main tree and *not* in the MAC tree, where the sole result is conflicts. Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message