Date: Fri, 05 Jul 2002 14:42:24 -0700 From: Peter Wemm <peter@wemm.org> To: Bill Fenner <fenner@research.att.com> 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 ... Message-ID: <20020705214224.38AA33808@overcee.wemm.org> In-Reply-To: <200207051445.HAA22031@windsor.research.att.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020705214224.38AA33808>