Re: Re: CVS bug with -D and vendor branches

[staffan.ohman]

Hmm.. couldn't read back the patch correctly from the
list myself so here we go once again. This time with
the patch as an attachment also. 

Index: rcs.c
===================================================================
RCS file: /usr/local/cvsroot/cvs_src/src/rcs.c,v
retrieving revision 1.1.1.2
retrieving revision 1.4
diff -u -r1.1.1.2 -r1.4
--- rcs.c       18 Apr 2002 08:04:05 -0000      1.1.1.2
+++ rcs.c       18 Apr 2002 08:08:55 -0000      1.4
@@ -2935,7 +2935,9 @@
     char *cur_rev = NULL;
     char *retval = NULL;
     Node *p;
+    Node *p_1_1;
     RCSVers *vers = NULL;
+    RCSVers *vers_1_1 = NULL;

     /* make sure we have something to look at... */
     assert (rcs != NULL);
@@ -3000,7 +3002,9 @@
        if (p)
        {
            vers = (RCSVers *) p->data;
-           if (RCS_datecmp (vers->date, date) != 0)
+           p_1_1 = findnode (rcs->versions, "1.1");
+           vers_1_1 = (RCSVers *) p_1_1->data;
+           if (RCS_datecmp (vers->date, vers_1_1->date) 
!= 0)
                return xstrdup ("1.1");
        }
     }

Index: rcs.c
===================================================================
RCS file: /usr/local/cvsroot/cvs_src/src/rcs.c,v
retrieving revision 1.1.1.2
retrieving revision 1.4
diff -u -r1.1.1.2 -r1.4
--- rcs.c       18 Apr 2002 08:04:05 -0000      1.1.1.2
+++ rcs.c       18 Apr 2002 08:08:55 -0000      1.4
@@ -2935,7 +2935,9 @@
     char *cur_rev = NULL;
     char *retval = NULL;
     Node *p;
+    Node *p_1_1;
     RCSVers *vers = NULL;
+    RCSVers *vers_1_1 = NULL;
 
     /* make sure we have something to look at... */
     assert (rcs != NULL);
@@ -3000,7 +3002,9 @@
        if (p)
        {
            vers = (RCSVers *) p->data;
-           if (RCS_datecmp (vers->date, date) != 0)
+           p_1_1 = findnode (rcs->versions, "1.1");
+           vers_1_1 = (RCSVers *) p_1_1->data;
+           if (RCS_datecmp (vers->date, vers_1_1->date) != 0)
                return xstrdup ("1.1");
        }
     }