Re: update command change behavior

[David O'Brien]

On Thu, May 29, 2008 at 12:01:36PM -0400, bug-cvs-request@nongnu.org wrote:
> Date: Wed, 28 May 2008 10:49:19 -0500 (CDT)
> From: jbreed@intrinsity.com
..
> >Synopsis:    update performs updates that are not required
> >Severity:    serious
> >Priority:    high
> >Category:    cvs
> >Class:               sw-bug
> >Release:     1.11.23

I'd like to 2nd that 1.11.23 has serious 'cvs update' bugs.

I updated the FreeBSD in-tree CVS to 1.11.23 (really 10-March-2008 1.11
branch snapshot).  I've been skinned alive for the change in 'cvs update'
behavior.  I think as more folks move to 1.11.23 there will be quite a
bit of wanting to tar N' feather someone...

This is the diff I've put into the FreeBSD source tree:

Index: classify.c
===================================================================
RCS file: /home/ncvs/src/contrib/cvs/src/classify.c,v
retrieving revision 1.1.1.10
retrieving revision 1.3
diff -u -p -r1.1.1.10 -r1.3
--- classify.c  19 Mar 2008 14:46:55 -0000      1.1.1.10
+++ classify.c  6 Jun 2008 16:16:44 -0000       1.3
@@ -34,11 +34,14 @@ keywords_may_change (aflag, vers)
            aflag
            /* ...and...  */
            && (/* ...there used to be a tag which subs in Name keys...  */
-               (vers->entdata->tag && !isdigit (vers->entdata->tag[0]))
+               (vers->entdata->tag && !isdigit (vers->entdata->tag[0])
+                   && vers->tag && !isdigit (vers->tag[0])
+                   && strcmp (vers->entdata->tag, vers->tag))
                /* ...or there used to be a keyword mode which may be
                 * changed by -A...
                 */
                || (strlen (vers->entdata->options)
+                   && strcmp (vers->entdata->options, vers->options)
                    && strcmp (vers->entdata->options, "-kkv")
                    && strcmp (vers->entdata->options, "-kb"))))
        /* ...or...  */

-- 
-- David  (obrien@FreeBSD.org)