From owner-freebsd-questions  Sat Sep 21 22:04:49 1996
Return-Path: owner-questions
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id WAA12666
          for questions-outgoing; Sat, 21 Sep 1996 22:04:49 -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 ESMTP id WAA12647
          for <freebsd-questions@freebsd.org>; Sat, 21 Sep 1996 22:04:47 -0700 (PDT)
Received: from friley216.res.iastate.edu (friley216.res.iastate.edu [129.186.78.216])
          by who.cdrom.com (8.7.5/8.6.11) with ESMTP id WAA01389
          for <freebsd-questions@freebsd.org>; Sat, 21 Sep 1996 22:04:45 -0700 (PDT)
Received: from friley216.res.iastate.edu (loopback [127.0.0.1]) by friley216.res.iastate.edu (8.7.5/8.7.3) with ESMTP id AAA00456 for <freebsd-questions@freebsd.org>; Sun, 22 Sep 1996 00:03:18 -0500 (CDT)
Message-Id: <199609220503.AAA00456@friley216.res.iastate.edu>
To: freebsd-questions@freebsd.org
Subject: How to merge CVS trees?
Date: Sun, 22 Sep 1996 00:03:18 -0500
From: "Chris Csanady" <ccsanady@friley216.res.iastate.edu>
Sender: owner-questions@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

I have the cvs trees for smp, and the current sys, and I was wondering
how I could merge them.  It is really annoying having kernel sources
with mismatching sized things.  (ie. proc)

-chris