From owner-cvs-gnu  Wed Mar 26 22:15:05 1997
Return-Path: <owner-cvs-gnu>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id WAA07739
          for cvs-gnu-outgoing; Wed, 26 Mar 1997 22:15:05 -0800 (PST)
Received: from godzilla.zeta.org.au (godzilla.zeta.org.au [203.2.228.19])
          by freefall.freebsd.org (8.8.5/8.8.5) with ESMTP id WAA07726;
          Wed, 26 Mar 1997 22:14:59 -0800 (PST)
Received: (from bde@localhost) by godzilla.zeta.org.au (8.8.5/8.6.9) id RAA12494; Thu, 27 Mar 1997 17:03:02 +1100
Date: Thu, 27 Mar 1997 17:03:02 +1100
From: Bruce Evans <bde@zeta.org.au>
Message-Id: <199703270603.RAA12494@godzilla.zeta.org.au>
To: jkh@time.cdrom.com, obrien@NUXI.com
Subject: Re: cvs commit: src/gnu/usr.bin/cpio - Imported sources
Cc: cvs-all@freefall.freebsd.org, CVS-committers@freefall.freebsd.org,
        cvs-gnu@freefall.freebsd.org, obrien@freefall.freebsd.org
Sender: owner-cvs-gnu@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

>> Foo.  This would also have been an excellent time to move cpio
>> to contrib. :-(
>
>It is my intention to do this with the update to v2.4.2, and was thinking
>of doing this with this commit... but frankly I was afraid of really
>screwing things up.  I've never done a move like this before in CVS.  How
>to keep the history?

It's hard to do without screwing up the history and losing patches, but
there is no point to just moving things - you have to separate out the
FreeBSD Makefiles and local files and keep the old directory hierarchy
to build in.  See gdb and texinfo for how not to do things (history is
in attics ...).  gdb was complicated becase we have significant local
changes and we switched to using the distribution files in a few cases
(and these files had some but not all of our changes).  texinfo was
simple except for the directory layout changing, but some patches and
all history were lost.  cpio is as simple as texinfo.  It mainly has
whitespace changes which should be lost :-).

>I want to import v2_4_2 today (or tomarrow), but need a little help with
>the steps to doing the merge w/o really messing up the repository.

Wait for it to be moved.

Bruce