From owner-freebsd-chat  Thu Oct  2 09:49:46 1997
Return-Path: <owner-freebsd-chat>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id JAA07780
          for chat-outgoing; Thu, 2 Oct 1997 09:49:46 -0700 (PDT)
Received: from bitbox.follo.net (bitbox.follo.net [194.198.43.36])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id JAA07772
          for <chat@FreeBSD.ORG>; Thu, 2 Oct 1997 09:49:39 -0700 (PDT)
Received: (from eivind@localhost)
	by bitbox.follo.net (8.8.6/8.8.6) id SAA23855;
	Thu, 2 Oct 1997 18:49:11 +0200 (MET DST)
Date: Thu, 2 Oct 1997 18:49:11 +0200 (MET DST)
Message-Id: <199710021649.SAA23855@bitbox.follo.net>
From: Eivind Eklund <perhaps@yes.no>
To: Andreas Klemm <andreas@klemm.gtn.com>
CC: chat@FreeBSD.ORG
In-reply-to: Andreas Klemm's message of Thu, 2 Oct 1997 11:56:49 +0200
Subject: Re: CVS kills me or did I kill CVS ? cvs import / cvs HEAD question ...
References: <19971002115649.22387@klemm.gtn.com>
Sender: owner-freebsd-chat@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

> 
> Hi !
> 
> I started to get apsfilter under CVS control and imported
> every released apsfilter version by doing something like:
> 
> 	mkdir ~/src/apsfilter
> 	cd ~/src/apsfilter
> 	tar xvpf ../apsfilter.released/aps-48.tgz
> 	cvs import -m "apsfilter V 4.8" src/apsfilter APSFILTER v4_8
> 	rm -rf *
> 	[...]
> 	tar xvpf ../apsfilter.released/aps-491.tgz
> 	cvs import -m "apsfilter V 4.91" src/apsfilter APSFILTER v4_91
> 
> Now I forgot to checkout apsfilter first before doing modifications..
> I "saved" this modified version by moving the apsfilter directory
> to apsfilter.new
> 
> Then I though checking out apsfilter and replacing the files should
> do the trick.
> 	
> 	cd ~/src
> 	mv apsfilter apsfilter.new
> 	cvs checkout apsfilter
> 
> I had to recognize, that checking out a module from a cvs
> repository that only consists of vendor (or release ?)
> branches seems to checkout every file in it's last version.
> 
> So I got more files (on the whole, a mix of all versions I 
> imported) than I wanted.

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.

Eivind.