[Cvs-cvs] ccvs doc/ChangeLog doc/cvs.texinfo src/ChangeLo...

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   06/07/11 20:00:04

Modified files:
        doc            : ChangeLog cvs.texinfo 
        src            : ChangeLog log.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&r1=1.967&r2=1.968
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&r1=1.692&r2=1.693
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3470&r2=1.3471
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/log.c?cvsroot=cvs&r1=1.109&r2=1.110

Patches:
Index: doc/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.967
retrieving revision 1.968
diff -u -b -r1.967 -r1.968
--- doc/ChangeLog       26 Jun 2006 13:06:39 -0000      1.967
+++ doc/ChangeLog       11 Jul 2006 20:00:03 -0000      1.968
@@ -1,3 +1,8 @@
+2006-07-11  Larry Jones  <address@hidden>
+
+       * cvs.texinfo (log options): -b is a revision selection option, not
+       a header field option.
+
 2006-06-26  Derek Price  <address@hidden>
 
        * cvs.texinfo (Adding files): Correct spelling (from wiki.)

Index: doc/cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -b -r1.692 -r1.693
--- doc/cvs.texinfo     26 Jun 2006 13:06:39 -0000      1.692
+++ doc/cvs.texinfo     11 Jul 2006 20:00:03 -0000      1.693
@@ -11109,10 +11109,11 @@
 
 By default, @code{log} prints all information that is
 available.  All other options restrict the output.  Note that the revision
-selection options (@code{-d}, @code{-r}, @code{-s}, and @code{-w}) have no
+selection options (@code{-b}, @code{-d}, @code{-r}, @code{-s}, and @code{-w})
+have no
 effect, other than possibly causing a search for files in Attic directories,
 when used in conjunction with the options that restrict the output to only
address@hidden header fields (@code{-b}, @code{-h}, @code{-R}, and @code{-t})
address@hidden header fields (@code{-h}, @code{-R}, and @code{-t})
 unless the @code{-S} option is also specified.
 
 @table @code

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3470
retrieving revision 1.3471
diff -u -b -r1.3470 -r1.3471
--- src/ChangeLog       6 Jul 2006 22:44:57 -0000       1.3470
+++ src/ChangeLog       11 Jul 2006 20:00:03 -0000      1.3471
@@ -1,3 +1,9 @@
+2006-07-11  Larry Jones  <address@hidden>
+
+       * log.c (log_usage): Fix misleading description of -b (it selects
+       revisions on the default branch *in addition to* revisions selected
+       with -r).
+
 2006-07-06  Derek Price  <address@hidden>
 
        * Makefile.am (cvs_SOURCES): Add missing header files.

Index: src/log.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/log.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- src/log.c   24 May 2006 16:38:51 -0000      1.109
+++ src/log.c   11 Jul 2006 20:00:04 -0000      1.110
@@ -104,7 +104,7 @@
     /* Nonzero if the -N option was seen, meaning that tag information
        should not be printed.  */
     int notags;
-    /* Nonzero if the -b option was seen, meaning that only revisions
+    /* Nonzero if the -b option was seen, meaning that revisions
        on the default branch should be printed.  */
     int default_branch;
     /* Nonzero if the -S option was seen, meaning that the header/name
@@ -171,7 +171,7 @@
     "Usage: %s %s [-lRhtNb] [-r[revisions]] [-d dates] [-s states]\n",
     "    [-w[logins]] [files...]\n",
     "\t-l\tLocal directory only, no recursion.\n",
-    "\t-b\tOnly list revisions on the default branch.\n",
+    "\t-b\tList revisions on the default branch.\n",
     "\t-h\tOnly print header.\n",
     "\t-R\tOnly print name of RCS file.\n",
     "\t-t\tOnly print header and descriptive text.\n",