From owner-cvs-all Fri Jul 5 7:46:20 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 A1EFB37B41B; Fri, 5 Jul 2002 07:46:06 -0700 (PDT) Received: from mail-blue.research.att.com (H-135-207-30-102.research.att.com [135.207.30.102]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B30A43E4A; Fri, 5 Jul 2002 07:46:05 -0700 (PDT) (envelope-from fenner@research.att.com) Received: from alliance.research.att.com (alliance.research.att.com [135.207.26.26]) by mail-blue.research.att.com (Postfix) with ESMTP id CAF954CE1B; Fri, 5 Jul 2002 10:46:00 -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 KAA25790; Fri, 5 Jul 2002 10:45:59 -0400 (EDT) From: Bill Fenner Received: (from fenner@localhost) by windsor.research.att.com (8.8.8+Sun/8.8.5) id HAA22031; Fri, 5 Jul 2002 07:45:59 -0700 (PDT) Message-Id: <200207051445.HAA22031@windsor.research.att.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII To: des@ofug.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 ... Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org References: <200207051141.EAA19929@windsor.research.att.com> Date: Fri, 5 Jul 2002 07:45:58 -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 It looks like a bug in the CVS client; the server wants new files (makes sense) but the client doesn't necessarily send them. This patch makes the client always send new files; this might or might not be 100% right but it allowed the libpcap commit to work even though it had the exact same problem. (Caution: whitespace damage) =================================================================== RCS file: /home/ncvs/src/contrib/cvs/src/client.c,v retrieving revision 1.2.2.3 diff -u -r1.2.2.3 client.c --- client.c 28 Oct 2001 21:32:07 -0000 1.2.2.3 +++ client.c 5 Jul 2002 14:37:41 -0000 @@ -5226,7 +5226,8 @@ } else if (vers->ts_rcs == NULL || args->force - || strcmp (vers->ts_user, vers->ts_rcs) != 0) + || strcmp (vers->ts_user, vers->ts_rcs) != 0 + || (vers->vn_user && *vers->vn_user == '0')) { if (args->no_contents && supported_request ("Is-modified")) I think the "cvs update -j..." filled in the timestamp in the Entries, so the client decided not to send the file because the timestamp in Entries was the same as the timestamp of the file. The right fix is for "cvs update -j ..." to not fill in the timestamp when it creates a new file -- but this bandaid works for me for now. Bill To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message