From owner-freebsd-chat Thu Oct 2 03:21:07 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id DAA17808 for chat-outgoing; Thu, 2 Oct 1997 03:21:07 -0700 (PDT) Received: from news1.gtn.com (news1.gtn.com [194.77.0.15]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id DAA17801 for ; Thu, 2 Oct 1997 03:20:59 -0700 (PDT) Received: (from uucp@localhost) by news1.gtn.com (8.8.6/8.8.6) with UUCP id LAA00143 for chat@FreeBSD.ORG; Thu, 2 Oct 1997 11:00:32 +0100 (MET) Received: (from andreas@localhost) by klemm.gtn.com (8.8.7/8.8.7) id LAA15143; Thu, 2 Oct 1997 11:56:49 +0200 (CEST) Message-ID: <19971002115649.22387@klemm.gtn.com> Date: Thu, 2 Oct 1997 11:56:49 +0200 From: Andreas Klemm To: chat@FreeBSD.ORG Subject: CVS kills me or did I kill CVS ? cvs import / cvs HEAD question ... Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.81 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 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. This way I recognized, that the CVS repository I created is something different from the FreeBSD one, where checking out a module always results in getting the latest version where everybody is working on (HEAD). Ok, now I thought I have perhaps to checkout the latest version and import it as HEAD ... (feel now something like "bastard CVS-meister from hell" ;-) But currently I don't know it better and trying to make my experiences to get better knowledge of CVS. So I did a: cd ~/src rm -rf apsfilter cvs checkout -r v4_91 apsfilter cd apsfilter cvs import -m "apsfilter V 4.91" src/apsfilter APSFILTER HEAD But simply doing a checkout still bring only version 4.91 ... Now the questions ... Do I have done something evil by importing to HEAD ? If yes, is it recoverable and how ? How do bring version v4_91 to HEAD in a sane way ? Did I understand something basically wrong or was the way to get apsfilter under CVS control correct ? Thanks Andreas /// -- 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