Date: Sat, 20 Mar 1999 08:21:28 +1100 From: Bruce Evans <bde@zeta.org.au> To: dcs@newsguy.com, peter@netplex.com.au Cc: cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org, grog@lemis.com Subject: Re: cvs add bug (was: cvs commit: src/contrib/cvs/src diff.c) Message-ID: <199903192121.IAA30328@godzilla.zeta.org.au>
next in thread | raw e-mail | index | archive | help
>> I'm pretty sure it only affected things like: "cvs diff -r RELENG_3" and >> would have done strange things like report diff hits with zero chunks or >> claim files were dead when in fact they were not. > >Mmmm... I noticed that if I have RELENG_3 checked out and try a diff >against HEAD, it won't show anything. Could this be related (or is >just a case of me having to do my homework)? That seems to be fixed, but diffing HEAD against a checked out HEAD was horribly broken by the new (distribution) cvs code. I use the following "fix" (the second hunk is just a style fix for our previous "fix"). Bruce diff -c2 diff.c~ diff.c *** diff.c~ Fri Mar 19 09:34:59 1999 --- diff.c Fri Mar 19 20:34:47 1999 *************** *** 439,443 **** (vers->vn_rcs == NULL ? NULL ! : RCS_branch_head (vers->srcfile, vers->vn_rcs)); exists = head != NULL; if (head != NULL) --- 439,444 ---- (vers->vn_rcs == NULL ? NULL ! : RCS_branch_head (vers->srcfile, vers->vn_rcs) ! && !RCS_isdead (vers->srcfile, vers->vn_rcs)); exists = head != NULL; if (head != NULL) *************** *** 450,455 **** xvers = Version_TS (finfo, NULL, diff_rev1, diff_date1, 1, 0); ! exists = (xvers->vn_rcs != NULL && ! !RCS_isdead (xvers->srcfile, xvers->vn_rcs)); /*XXX*/ freevers_ts (&xvers); } --- 451,456 ---- xvers = Version_TS (finfo, NULL, diff_rev1, diff_date1, 1, 0); ! exists = (xvers->vn_rcs != NULL ! && !RCS_isdead (xvers->srcfile, xvers->vn_rcs)); freevers_ts (&xvers); } 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?199903192121.IAA30328>