From owner-cvs-all Fri Jul 5 14:42:32 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 1800537B405; Fri, 5 Jul 2002 14:42:25 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id B174643E09; Fri, 5 Jul 2002 14:42:24 -0700 (PDT) (envelope-from peter@wemm.org) Received: from fw.wemm.org (canning.wemm.org [192.203.228.65]) by canning.wemm.org (Postfix) with ESMTP id 8DEED2A7D6; Fri, 5 Jul 2002 14:42:24 -0700 (PDT) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (Postfix) with ESMTP id 406C24C242; Fri, 5 Jul 2002 14:42:24 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 38AA33808; Fri, 5 Jul 2002 14:42:24 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Bill Fenner Cc: des@ofug.org, 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 ... In-Reply-To: <200207051445.HAA22031@windsor.research.att.com> Date: Fri, 05 Jul 2002 14:42:24 -0700 From: Peter Wemm Message-Id: <20020705214224.38AA33808@overcee.wemm.org> 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 Bill Fenner wrote: > > 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. This makes sense to me. Do you feel like committing this? Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message