From owner-cvs-all Fri Jul 5 4:41:31 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 243ED37B400; Fri, 5 Jul 2002 04:41:27 -0700 (PDT) Received: from mail-green.research.att.com (H-135-207-30-103.research.att.com [135.207.30.103]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5642A43E3B; Fri, 5 Jul 2002 04:41:26 -0700 (PDT) (envelope-from fenner@research.att.com) Received: from alliance.research.att.com (alliance.research.att.com [135.207.26.26]) by mail-green.research.att.com (Postfix) with ESMTP id 089811E02E; Fri, 5 Jul 2002 07:41:22 -0400 (EDT) Received: from windsor.research.att.com (windsor.research.att.com [135.207.26.46]) by alliance.research.att.com (8.8.7/8.8.7) with ESMTP id HAA23871; Fri, 5 Jul 2002 07:41:20 -0400 (EDT) From: Bill Fenner Received: (from fenner@localhost) by windsor.research.att.com (8.8.8+Sun/8.8.5) id EAA19929; Fri, 5 Jul 2002 04:41:20 -0700 (PDT) Message-Id: <200207051141.EAA19929@windsor.research.att.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII To: cvs-committers@FreeBSD.Org, cvs-all@FreeBSD.Org Subject: Re: cvs commit: src/contrib/tcpdump print-arp.c print-atalk.c print-atm.c print-bgp.c print-bootp.c print-bxxp.c print-cdp.c print-chdlc.c print-cip.c print-cnfp.c print-decnet.c print-dhcp6.c print-domain.c print-dvmrp.c print-egp.c print-esp.c ... Date: Fri, 5 Jul 2002 04:41:20 -0700 Versions: dmail (solaris) 2.4c/makemail 2.9d Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This commit message is incomplete. CVS choked on every new file in this commit, and died without emailing the commit messages. There are some messages in: cvs commit: saving log message in /tmp/cvspPaGh7 cvs commit: saving log message in /tmp/cvsed1Xq0 cvs commit: saving log message in /tmp/cvsIt2Os9 cvs commit: saving log message in /tmp/cvsmYae98 I don't know what I did wrong to make CVS choke so badly. To do the merge, I did: cvs co -rRELENG_4 contrib_tcpdump cvs update -jv3_6_2 -jv3_7_1 contrib_tcpdump (fix conflicts) cvs commit contrib_tcpdump A "cvs update" showed the new files with "A" by them, which seemed OK. CVS was doing the right thing for each of these files (adding the RELENG_4 branch tag to the relevant version), but would also abort the commit, e.g. Checking in contrib_tcpdump/ieee802_11.h; /home/ncvs/src/contrib/tcpdump/ieee802_11.h,v <-- ieee802_11.h cvs server: ieee802_11.h: No such file or directory cvs [server aborted]: error diffing ieee802_11.h cvs commit: saving log message in /tmp/cvsed1Xq0 The CVS/Entries file had the expected contents, e.g. /filename/0/date//TRELENG_4. This was a supreme pain and left the repository inconsistent for about half an hour. What did I do wrong? How can I avoid this in the future? The client CVS was 4-STABLE's: Concurrent Versions System (CVS) 1.11.1p1-FreeBSD (client/server) and the server, obviously, was freefall's. Bill To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message