From owner-cvs-src@FreeBSD.ORG  Tue Apr  1 04:03:50 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC893106564A;
	Tue,  1 Apr 2008 04:03:50 +0000 (UTC)
	(envelope-from jb@what-creek.com)
Received: from what-creek.com (what-creek.com [66.111.37.70])
	by mx1.freebsd.org (Postfix) with ESMTP id B3CF88FC15;
	Tue,  1 Apr 2008 04:03:50 +0000 (UTC)
	(envelope-from jb@what-creek.com)
Received: by what-creek.com (Postfix, from userid 102)
	id E60CA732AD; Tue,  1 Apr 2008 04:03:49 +0000 (GMT)
Date: Tue, 1 Apr 2008 04:03:49 +0000
From: John Birrell <jb@what-creek.com>
To: David O'Brien <obrien@FreeBSD.org>
Message-ID: <20080401040349.GA74837@what-creek.com>
References: <200803282147.m2SLlC0R038334@repoman.freebsd.org>
	<20080330235811.GA23907@dragon.NUXI.org>
	<20080331002108.GC61720@what-creek.com>
	<20080401024255.GC66987@dragon.NUXI.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20080401024255.GC66987@dragon.NUXI.org>
User-Agent: Mutt/1.4.2.3i
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: CVSROOT exclude
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2008 04:03:51 -0000

On Mon, Mar 31, 2008 at 07:42:55PM -0700, David O'Brien wrote:
> I assume these will be removed in the near future?
> 
>     # ZFS sources
>     ^src/compat/opensolaris
>     ^src/contrib/opensolaris
>     ^src/sys/compat/opensolaris
>     ^src/sys/contrib/opensolaris

These ones have to stay until the changes are MFC'd to RELENG_7.
AFAIK, the cvs server uses the latest version on CVSROOT/exclude
for pre-commit checks.

I am advised to 'cvs add' the RELENG_7 files despite the fact that
the history on that branch is in on the branch now renamed as
old_RELENG_7.

I think I need to do that initial 'cvs add' without any changes to
files -- just a note about where the history is.

Once that is done, the corresponding lines can be removed from
 the exclude file.

>     # CDDL sources
>     ^src/cddl/compat/opensolaris
>     ^src/cddl/contrib/opensolaris
>     ^src/sys/cddl/compat/opensolaris
>     ^src/sys/cddl/contrib/opensolaris

I will do a followup commit to the src/cddl/compat/opensolaris and
src/sys/cddl/compat/opensolaris files to add FreeBSD IDs to them.

Then those two lines can be removed from the exclude file.

The remaining two lines:

^src/cddl/contrib/opensolaris
^src/sys/cddl/contrib/opensolaris

need to stay.

--
John Birrell