Date: Sun, 22 Jan 1995 17:22:32 +0100 (MET) From: Ollivier Robert <roberto@blaise.ibp.fr> To: freebsd-hackers@FreeBSD.org (FreeBSD Hackers' list) Subject: CVS tree problem with tcpdump Message-ID: <199501221622.RAA00782@keltia.frmug.fr.net>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199501221622.RAA00782>