From owner-freebsd-hackers Sun Jan 22 08:26:27 1995 Return-Path: hackers-owner Received: (from root@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id IAA07082 for hackers-outgoing; Sun, 22 Jan 1995 08:26:27 -0800 Received: from ibp.ibp.fr (ibp.ibp.fr [132.227.60.30]) by freefall.cdrom.com (8.6.9/8.6.6) with ESMTP id IAA07075 for ; Sun, 22 Jan 1995 08:26:20 -0800 Received: from blaise.ibp.fr (blaise.ibp.fr [132.227.60.1]) by ibp.ibp.fr (8.6.8/jtpda-5.0) with SMTP id RAA24104 for ; Sun, 22 Jan 1995 17:27:14 +0100 Received: by blaise.ibp.fr (4.1/SMI-4.1) id AA04441; Sun, 22 Jan 95 17:27:13 +0100 Received: (from roberto@localhost) by keltia.frmug.fr.net (8.6.9/keltia-uucp-1.21) id RAA00782 for freebsd-hackers@FreeBSD.ORG; Sun, 22 Jan 1995 17:22:33 +0100 From: Ollivier Robert Message-Id: <199501221622.RAA00782@keltia.frmug.fr.net> Subject: CVS tree problem with tcpdump To: freebsd-hackers@FreeBSD.org (FreeBSD Hackers' list) Date: Sun, 22 Jan 1995 17:22:32 +0100 (MET) Reply-To: roberto@blaise.ibp.fr (Ollivier Robert) X-Operating-System: FreeBSD 2.1.0-Development ctm#295 X-Mailer: ELM [version 2.4 PL24] Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Content-Length: 1612 Sender: hackers-owner@FreeBSD.org Precedence: bulk I think something has not been done when tcpdump was imported : The log shows this 8 conflicts created by this import. Use the following command to help the merge: cvs checkout -jtcpdump:yesterday -jtcpdump src/usr.sbin/tcpdump/tcpdump and I don't see any "merge" log entry. Some thing interesting is that a few files should have a tcpdump3_0 tag for version 1.1.1.2 and the 1.1.1.2 revision is not the the ,v file... Take VERSION,v : ------------------------------------------------------------ head 1.1; branch 1.1.1; access; symbols tcpdump3_0:1.1.1.2 <<<< TAG for 1.1.1.2 tcpdump:1.1.1 RELEASE_2_0:1.1.1.1 BETA_2_0:1.1.1.1 ALPHA_2_0:1.1.1.1.0.4 MOVED_NEWCVS:1.1.1.1 FINAL_1_1_5:1.1.1.1 ALPHA_1_1_5:1.1.1.1 FINAL_1_1:1.1.1.1 GAMMA_1_1:1.1.1.1 BETA_1_1:1.1.1.1.0.2 BP_BETA_1_1:1.1.1.1 FINAL_1_0:1.1.1.1 EPSILON_1_0:1.1.1.1 GAMMA_1_0:1.1.1.1 BETA_1_0:1.1.1.1 ALPHA_1_0:1.1.1.1 V_0_1_2_4:1.1.1.1 V_0_1_2_4:1.1.1; locks; strict; comment @# @; 1.1 date 93.06.12.14.42.13; author rgrimes; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 93.06.12.14.42.14; author rgrimes; state Exp; branches; next ; desc @@ 1.1 log @Initial revision @ text ------------------------------------------------------------ and there is no 1.1.1.2 revision. -- Ollivier ROBERT -=- The daemon is FREE! -=- roberto@keltia.frmug.fr.net FreeBSD keltia 2.1.0-Development #9: Tue Jan 17 21:12:14 MET 1995