From owner-freebsd-smp  Thu Jun  6 01:38:17 1996
Return-Path: owner-smp
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id BAA10938
          for smp-outgoing; Thu, 6 Jun 1996 01:38:17 -0700 (PDT)
Received: from who.cdrom.com (who.cdrom.com [204.216.27.3])
          by freefall.freebsd.org (8.7.5/8.7.3) with SMTP id BAA10932;
          Thu, 6 Jun 1996 01:38:14 -0700 (PDT)
Received: from epprod.elsevier.co.uk (epprod.elsevier.co.uk [193.131.222.35])
          by who.cdrom.com (8.6.12/8.6.11) with ESMTP id BAA19581
          ; Thu, 6 Jun 1996 01:34:23 -0700
Received: from snowdon.elsevier.co.uk (snowdon.elsevier.co.uk [193.131.197.164]) by epprod.elsevier.co.uk (8.6.13/8.6.12) with ESMTP id JAA05476; Thu, 6 Jun 1996 09:31:05 +0100
Received: from tees by snowdon with SMTP (PP); Thu, 6 Jun 1996 09:31:13 +0100
Received: (from dpr@localhost) by tees (SMI-8.6/8.6.12) id JAA24251;
          Thu, 6 Jun 1996 09:30:53 +0100
Date: Thu, 6 Jun 1996 09:30:53 +0100
Message-Id: <199606060830.JAA24251@tees>
To: Poul-Henning Kamp <phk@freebsd.org>
Cc: Terry Lambert <terry@lambert.org>, sef@kithrup.com, smp@freebsd.org
Subject: Re: Unix/NT synchronization model (was: SMP progress?)
In-Reply-To: <1856.834001792@critter2.tfs.com>
References: <199606051858.LAA29430@phaeton.artisoft.com>	<1856.834001792@critter2.tfs.com>
Reply-To: p.richards@elsevier.co.uk
From: Paul Richards <p.richards@elsevier.co.uk>
X-Attribution: Paul
X-Mailer: GNU Emacs [19.30.1], RMAIL, Mailcrypt [3.3]
Sender: owner-smp@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

>>>>> "Poul-Henning" == Poul-Henning Kamp <phk@freebsd.org> writes:

Poul-Henning> In message <199606051858.LAA29430@phaeton.artisoft.com>,

>> Each time I pull an updated tree from my local mirror of the CVS
>> tree, I must re-merge and re-integrate all of my patches.
Poul-Henning> join the club. :-(

Well, a cludge way to do it is to not ctm the cvs tree but just the source
tree and then maintain your own cvs tree with the FreeBSD sources on
a vendor branch. If you want to have FreeBSD's cvs tree as well then stick
it somewhere else. The ctm patches to src then get applied to a vendor
branch of *your* cvs tree.

I've never tried this but I've been thinking about it a bit.