Date: Fri, 5 Jul 2002 04:41:20 -0700 From: Bill Fenner <fenner@research.att.com> 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 ... Message-ID: <200207051141.EAA19929@windsor.research.att.com>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207051141.EAA19929>