From owner-cvs-all  Thu Mar 18 17:32: 1 1999
Delivered-To: cvs-all@freebsd.org
Received: from spinner.netplex.com.au (spinner.netplex.com.au [202.12.86.3])
	by hub.freebsd.org (Postfix) with ESMTP
	id D417814F1B; Thu, 18 Mar 1999 17:31:52 -0800 (PST)
	(envelope-from peter@netplex.com.au)
Received: from spinner.netplex.com.au (localhost [127.0.0.1])
	by spinner.netplex.com.au (8.9.2/8.9.2/Netplex) with ESMTP id JAA35913;
	Fri, 19 Mar 1999 09:31:16 +0800 (WST)
	(envelope-from peter@spinner.netplex.com.au)
Message-Id: <199903190131.JAA35913@spinner.netplex.com.au>
X-Mailer: exmh version 2.0.2 2/24/98
To: Greg Lehey <grog@lemis.com>
Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs add bug (was: cvs commit: src/contrib/cvs/src diff.c) 
In-reply-to: Your message of "Fri, 19 Mar 1999 11:05:44 +1030."
             <19990319110544.C429@lemis.com> 
Date: Fri, 19 Mar 1999 09:31:16 +0800
From: Peter Wemm <peter@netplex.com.au>
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

Greg Lehey wrote:
> On Thursday, 18 March 1999 at  1:31:26 -0800, Peter Wemm wrote:
> > peter       1999/03/18 01:31:26 PST
> >
> >   Modified files:
> >     contrib/cvs/src      diff.c
> >   Log:
> >   Merge cvs-1.9.xx -> 1.10 changes onto mainline.
> >
> >   The merge turned up a long-standing bug in local additions.  I'm not
> >   quite sure it's right yet.  (the code in question is dealing with
> >   diffs relative to "HEAD" and dead revisions).
> 
> Does this mean it could bite us?  What are the symptoms?

I'm not 100% sure what it's effects were, but spot the mistake:

old code:
  xvers = Version_TS(.....);
  exists = xvers->vn_rcs != NULL;
FreeBSD version:
  xvers = Version_TS(.....);
  exists = (vers->vn_rcs != NULL  && !RCS_isdead(vers->.......));
I've changed it in the new merge to:
  xvers = Version_TS(.....);
  exists = (xvers->vn_rcs != NULL && !RCS_isdead(xvers->......));

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.

I'm not 100% sure about the RCS_isdead() stuff that we added any more.  It
looks like the Version_TS() calls are replacing the functionality, but I
have not investigated too closely yet.

> Greg

Cheers,
-Peter





To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message