From owner-freebsd-current  Sun May  4 13:14:25 1997
Return-Path: <owner-current>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id NAA14409
          for current-outgoing; Sun, 4 May 1997 13:14:25 -0700 (PDT)
Received: from cs.utah.edu (cs.utah.edu [128.110.4.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id NAA14394
          for <current@FreeBSD.ORG>; Sun, 4 May 1997 13:14:22 -0700 (PDT)
Received: from fast.cs.utah.edu by cs.utah.edu (8.8.4/utah-2.21-cs)
	id OAA00704; Sun, 4 May 1997 14:12:36 -0600 (MDT)
Received: by fast.cs.utah.edu (8.6.10/utah-2.15-leaf)
	id OAA22871; Sun, 4 May 1997 14:12:31 -0600
Date: Sun, 4 May 1997 14:12:31 -0600
From: vanmaren@fast.cs.utah.edu (Kevin Van Maren)
Message-Id: <199705042012.OAA22871@fast.cs.utah.edu>
To: joerg_wunsch@uriah.heep.sax.de, terry@lambert.org
Subject: Re: Help with merging in local changes with CVS etc...
Cc: current@FreeBSD.ORG, joes@spiritone.com
Sender: owner-current@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

What we've done here is to cvsup the CVS repository, and they
use RCS on individual files in the checked-out tree from
the cvsup-ed one.  Yes, it is a pain, but you get your
local revision history.  As Terry said, however, you do
have to check for conflicts (or other problems)) after an
update.

Kevin