Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Oct 1997 18:49:11 +0200 (MET DST)
From:      Eivind Eklund <perhaps@yes.no>
To:        Andreas Klemm <andreas@klemm.gtn.com>
Cc:        chat@FreeBSD.ORG
Subject:   Re: CVS kills me or did I kill CVS ? cvs import / cvs HEAD question ...
Message-ID:  <199710021649.SAA23855@bitbox.follo.net>
In-Reply-To: Andreas Klemm's message of Thu, 2 Oct 1997 11:56:49 %2B0200
References:  <19971002115649.22387@klemm.gtn.com>

next in thread | previous in thread | raw e-mail | index | archive | help
> 
> 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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199710021649.SAA23855>