From owner-freebsd-chat Thu Oct 2 14:39:44 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id OAA25211 for chat-outgoing; Thu, 2 Oct 1997 14:39:44 -0700 (PDT) Received: from news1.gtn.com (news1.gtn.com [192.109.159.3]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id OAA25204 for ; Thu, 2 Oct 1997 14:39:37 -0700 (PDT) Received: (from uucp@localhost) by news1.gtn.com (8.8.6/8.8.6) with UUCP id WAA02389; Thu, 2 Oct 1997 22:15:24 +0100 (MET) Received: (from andreas@localhost) by klemm.gtn.com (8.8.7/8.8.7) id VAA21939; Thu, 2 Oct 1997 21:09:31 +0200 (CEST) Message-ID: <19971002210931.49103@klemm.gtn.com> Date: Thu, 2 Oct 1997 21:09:31 +0200 From: Andreas Klemm To: Eivind Eklund Cc: chat@FreeBSD.ORG Subject: Re: CVS kills me or did I kill CVS ? cvs import / cvs HEAD question ... References: <19971002115649.22387@klemm.gtn.com> <199710021649.SAA23855@bitbox.follo.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.84 In-Reply-To: <199710021649.SAA23855@bitbox.follo.net>; from Eivind Eklund on Thu, Oct 02, 1997 at 06:49:11PM +0200 X-Disclaimer: A free society is one where it is safe to be unpopular X-Operating-System: FreeBSD 3.0-CURRENT SMP Sender: owner-freebsd-chat@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk On Thu, Oct 02, 1997 at 06:49:11PM +0200, Eivind Eklund wrote: > OK, what you want to do now is two checkouts - one one HEAD, and one > on R4_91 (or whatever your latest import is). Then you do > diff -Rq aps_head aps_4_91 > You'll then get a list of the files which are only in the head, which > are from previous versions. > You want to do a 'cvs remove -f' on these - then you'll move all the > old files to the attic. > > Then you'll want to copy in the latest changes, and commit them. Thanks, will try that ! -- Andreas Klemm powered by ,,symmetric multiprocessor FreeBSD'' andreas@klemm.gtn.com - http://www.freebsd.org/~fsmp/SMP/SMP.html andreas@FreeBSD.ORG - http://www.freebsd.org/~fsmp/SMP/benches.html