[Cvs-cvs] ccvs/src ChangeLog rcs.c

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   07/05/23 18:57:24

Modified files:
        src            : ChangeLog rcs.c 

Log message:
        merge changes from cvs1-11-x-branch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3509&r2=1.3510
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/rcs.c?cvsroot=cvs&r1=1.385&r2=1.386

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3509
retrieving revision 1.3510
diff -u -b -r1.3509 -r1.3510
--- ChangeLog   9 May 2007 23:54:33 -0000       1.3509
+++ ChangeLog   23 May 2007 18:57:24 -0000      1.3510
@@ -1,3 +1,7 @@
+2007-05-22  Larry Jones  <address@hidden>
+
+       * rcs.c (RCS_fully_parse): Include revision in error message.
+
 2007-05-09  Derek Price  <address@hidden>
        for Sylvain Beucler  <address@hidden>
 

Index: rcs.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/rcs.c,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -b -r1.385 -r1.386
--- rcs.c       16 Mar 2007 04:08:56 -0000      1.385
+++ rcs.c       23 May 2007 18:57:24 -0000      1.386
@@ -848,8 +848,8 @@
                        op = *cp++;
                        if (op != 'a' && op  != 'd')
                            error (1, 0, "\
-unrecognized operation '\\x%x' in %s",
-                                  op, rcs->print_path);
+unrecognized operation '\\x%x' in %s revision %s",
+                                  op, rcs->print_path, vnode->version);
                        (void) strtoul (cp, (char **) &cp, 10);
                        if (*cp++ != ' ')
                            error (1, 0, "space expected in %s revision %s",