Revert to distributed version

4 files changed, 84 insertions, 51 deletions

diff --git a/gnu/usr.bin/cvs/doc/cvs.info-3 b/gnu/usr.bin/cvs/doc/cvs.info-3
index ada6dd98f78..b3df1169505 100644
--- a/gnu/usr.bin/cvs/doc/cvs.info-3
+++ b/gnu/usr.bin/cvs/doc/cvs.info-3
@@ -832,7 +832,7 @@ merging will be the same as each other, and avoid spurious conflicts.
 Then you might get the following results from a merge:
 
      $ cat file1
-     key $Revision: 1.2 $
+     key $Revision: 1.3 $
      . . .
      $ cvs update -j br1
      U file1
@@ -843,9 +843,9 @@ Then you might get the following results from a merge:
      rcsmerge: warning: conflicts during merge
      $ cat file1
      <<<<<<< file1
-     key $Revision: 1.2 $
+     key $Revision: 1.3 $
      =======
-     key $Revision: 1.2 $
+     key $Revision: 1.3 $
      >>>>>>> 1.1.2.1
      . . .
 
@@ -858,7 +858,7 @@ the fact that your working directory had contained `Revision: 1.2'.
    Here is what happens if you had used `-kk':
 
      $ cat file1
-     key $Revision: 1.2 $
+     key $Revision: 1.3 $
      . . .
      $ cvs update -kk -j br1
      U file1
@@ -867,7 +867,7 @@ the fact that your working directory had contained `Revision: 1.2'.
      retrieving revision 1.1.2.1
      Merging differences between 1.1 and 1.1.2.1 into file1
      $ cat file1
-     key $Revision: 1.2 $
+     key $Revision: 1.3 $
      . . .
 
    What is going on here is that revision 1.1 and 1.1.2.1 both expand
diff --git a/gnu/usr.bin/cvs/doc/cvs.info-4 b/gnu/usr.bin/cvs/doc/cvs.info-4
index 76a4437d117..21e858e07eb 100644
--- a/gnu/usr.bin/cvs/doc/cvs.info-4
+++ b/gnu/usr.bin/cvs/doc/cvs.info-4
@@ -253,14 +253,14 @@ neither line ending conversion nor keyword expansion will be done.
    Here is an example of how you can create a new file using the `-kb'
 flag:
 
-     $ echo '$Id: cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $' > kotest
+     $ echo '$Id: cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $' > kotest
      $ cvs add -kb -m"A test file" kotest
      $ cvs ci -m"First checkin; contains a keyword" kotest
 
    If a file accidentally gets added without `-kb', one can use the
 `cvs admin' command to recover.  For example:
 
-     $ echo '$Id: cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $' > kotest
+     $ echo '$Id: cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $' > kotest
      $ cvs add -m"A test file" kotest
      $ cvs ci -m"First checkin; contains a keyword" kotest
      $ cvs admin -kb kotest
@@ -1011,8 +1011,11 @@ file.
 * Avoiding substitution::       Avoiding substitution
 * Substitution modes::          Substitution modes
 * Log keyword::                 Problems with the $Log: cvs.info-4,v $
-* Log keyword::                 Problems with the Revision 1.2  2001/09/29 00:00:39  tholo
-* Log keyword::                 Problems with the Merge remaining local changes, correct build issues
+* Log keyword::                 Problems with the Revision 1.3  2001/09/30 19:44:54  tholo
+* Log keyword::                 Problems with the Revert to distributed version
+* Log keyword::                 Problems with the
+* Log keyword::                 Problems with the Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+* Log keyword::                 Problems with the Latest from Cyclic Software
 * Log keyword::                 Problems with the keyword.
 
 
@@ -1026,17 +1029,17 @@ Keyword List
 `$Author: tholo $'
      The login name of the user who checked in the revision.
 
-`$Date: 2001/09/29 00:00:39 $'
+`$Date: 2001/09/30 19:44:54 $'
      The date and time (UTC) the revision was checked in.
 
-`$Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $'
+`$Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $'
      A standard header containing the full pathname of the RCS file,
      the revision number, the date (UTC), the author, the state, and
      the locker (if locked).  Files will normally never be locked when
      you use CVS.
 
-`$Id: cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $'
-     Same as `$Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $', except that the RCS filename is without a path.
+`$Id: cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $'
+     Same as `$Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $', except that the RCS filename is without a path.
 
 `$Name:  $'
      Tag name used to check out this file.  The keyword is expanded
@@ -1049,15 +1052,21 @@ Keyword List
      locked, which is the normal case unless `cvs admin -l' is in use).
 
 `$Log: cvs.info-4,v $
-`Revision 1.2  2001/09/29 00:00:39  tholo
-`Merge remaining local changes, correct build issues
+`Revision 1.3  2001/09/30 19:44:54  tholo
+`Revert to distributed version
+`
+`Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+`Latest from Cyclic Software
 `'
      The log message supplied during commit, preceded by a header
      containing the RCS filename, the revision number, the author, and
      the date (UTC).  Existing log messages are _not_ replaced.
      Instead, the new log message is inserted after `$Log: cvs.info-4,v $
-     Instead, the new log message is inserted after `Revision 1.2  2001/09/29 00:00:39  tholo
-     Instead, the new log message is inserted after `Merge remaining local changes, correct build issues
+     Instead, the new log message is inserted after `Revision 1.3  2001/09/30 19:44:54  tholo
+     Instead, the new log message is inserted after `Revert to distributed version
+     Instead, the new log message is inserted after `
+     Instead, the new log message is inserted after `Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+     Instead, the new log message is inserted after `Latest from Cyclic Software
      Instead, the new log message is inserted after `'.  Each
      new line is prefixed with the same string which precedes the
      `$Log' keyword.  For example, if the file contains
@@ -1065,8 +1074,11 @@ Keyword List
             /* Here is what people have been up to:
              *
              * $Log: cvs.info-4,v $
-             * Revision 1.2  2001/09/29 00:00:39  tholo
-             * Merge remaining local changes, correct build issues
+             * Revision 1.3  2001/09/30 19:44:54  tholo
+             * Revert to distributed version
+             *
+             * Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+             * Latest from Cyclic Software
              *
              * Revision 1.1  1997/01/03 14:23:51  joe
              * Add the superfrobnicate option
@@ -1083,7 +1095,7 @@ Keyword List
 `$RCSfile: cvs.info-4,v $'
      The name of the RCS file without a path.
 
-`$Revision: 1.2 $'
+`$Revision: 1.3 $'
      The revision number assigned to the revision.
 
 `$Source: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-4,v $'
@@ -1100,10 +1112,10 @@ Using keywords
 ==============
 
    To include a keyword string you simply include the relevant text
-string, such as `$Id: cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $', inside the file, and commit the file.  CVS will
+string, such as `$Id: cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $', inside the file, and commit the file.  CVS will
 automatically expand the string as part of the commit operation.
 
-   It is common to embed the `$Id: cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $' string in the source files so that
+   It is common to embed the `$Id: cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $' string in the source files so that
 it gets passed through to generated files.  For example, if you are
 managing computer program source code, you might include a variable
 which is initialized to contain that string.  Or some C compilers may
@@ -1117,11 +1129,11 @@ binary files.
 
      $ ident samp.c
      samp.c:
-          $Id: cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $
+          $Id: cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $
      $ gcc samp.c
      $ ident a.out
      a.out:
-          $Id: cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $
+          $Id: cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $
 
    SCCS is another popular revision control system.  It has a command,
 `what', which is very similar to `ident' and used for the same purpose.
@@ -1130,7 +1142,7 @@ character sequence `@(#)' it is easy to include keywords that are
 detected by either command.  Simply prefix the keyword with the magic
 SCCS phrase, like this:
 
-     static char *id="@(#) $Id: cvs.info-4,v 1.2 2001/09/29 00:00:39 tholo Exp $";
+     static char *id="@(#) $Id: cvs.info-4,v 1.3 2001/09/30 19:44:54 tholo Exp $";
 
 
 File: cvs.info,  Node: Avoiding substitution,  Next: Substitution modes,  Prev: Using keywords,  Up: Keyword substitution
@@ -1180,15 +1192,15 @@ files::, and *Note Merging and keywords::.
 `-kk'
      Generate only keyword names in keyword strings; omit their values.
      For example, for the `Revision' keyword, generate the string
-     `$Revision: 1.2 $' instead of `$Revision: 1.2 $'.  This option is useful
+     `$Revision: 1.3 $' instead of `$Revision: 1.3 $'.  This option is useful
      to ignore differences due to keyword substitution when comparing
      different revisions of a file (*note Merging and keywords::).
 
 `-ko'
      Generate the old keyword string, present in the working file just
      before it was checked in.  For example, for the `Revision'
-     keyword, generate the string `$Revision: 1.2 $' instead of
-     `$Revision: 1.2 $' if that is how the string appeared when the
+     keyword, generate the string `$Revision: 1.3 $' instead of
+     `$Revision: 1.3 $' if that is how the string appeared when the
      file was checked in.
 
 `-kb'
@@ -1202,9 +1214,9 @@ files::, and *Note Merging and keywords::.
 `-kv'
      Generate only keyword values for keyword strings.  For example,
      for the `Revision' keyword, generate the string `5.7' instead of
-     `$Revision: 1.2 $'.  This can help generate files in programming
+     `$Revision: 1.3 $'.  This can help generate files in programming
      languages where it is hard to strip keyword delimiters like
-     `$Revision: 1.2 $' from a string.  However, further keyword
+     `$Revision: 1.3 $' from a string.  However, further keyword
      substitution cannot be performed once the keyword names are
      removed, so this option should be used with care.
 
@@ -1216,25 +1228,37 @@ files::, and *Note Merging and keywords::.
 File: cvs.info,  Node: Log keyword,  Prev: Substitution modes,  Up: Keyword substitution
 
 Problems with the $Log: cvs.info-4,v $
-Problems with the Revision 1.2  2001/09/29 00:00:39  tholo
-Problems with the Merge remaining local changes, correct build issues
+Problems with the Revision 1.3  2001/09/30 19:44:54  tholo
+Problems with the Revert to distributed version
+Problems with the
+Problems with the Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+Problems with the Latest from Cyclic Software
 Problems with the keyword.
 ================================
 
    The `$Log: cvs.info-4,v $
-   The `Revision 1.2  2001/09/29 00:00:39  tholo
-   The `Merge remaining local changes, correct build issues
+   The `Revision 1.3  2001/09/30 19:44:54  tholo
+   The `Revert to distributed version
+   The `
+   The `Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+   The `Latest from Cyclic Software
    The `' keyword is somewhat controversial.  As long as you are
 working on your development system the information is easily accessible
 even if you do not use the `$Log: cvs.info-4,v $
-even if you do not use the `Revision 1.2  2001/09/29 00:00:39  tholo
-even if you do not use the `Merge remaining local changes, correct build issues
+even if you do not use the `Revision 1.3  2001/09/30 19:44:54  tholo
+even if you do not use the `Revert to distributed version
+even if you do not use the `
+even if you do not use the `Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+even if you do not use the `Latest from Cyclic Software
 even if you do not use the `' keyword--just do a `cvs log'.  Once
 you export the file the history information might be useless anyhow.
 
    A more serious concern is that CVS is not good at handling `$Log: cvs.info-4,v $
-   A more serious concern is that CVS is not good at handling `Revision 1.2  2001/09/29 00:00:39  tholo
-   A more serious concern is that CVS is not good at handling `Merge remaining local changes, correct build issues
+   A more serious concern is that CVS is not good at handling `Revision 1.3  2001/09/30 19:44:54  tholo
+   A more serious concern is that CVS is not good at handling `Revert to distributed version
+   A more serious concern is that CVS is not good at handling `
+   A more serious concern is that CVS is not good at handling `Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+   A more serious concern is that CVS is not good at handling `Latest from Cyclic Software
    A more serious concern is that CVS is not good at handling `'
 entries when a branch is merged onto the main trunk.  Conflicts often
 result from the merging operation.
@@ -1245,8 +1269,11 @@ information from `cvs log' will not be consistent with the information
 inside the file.  This may or may not be a problem in real life.
 
    It has been suggested that the `$Log: cvs.info-4,v $
-   It has been suggested that the `Revision 1.2  2001/09/29 00:00:39  tholo
-   It has been suggested that the `Merge remaining local changes, correct build issues
+   It has been suggested that the `Revision 1.3  2001/09/30 19:44:54  tholo
+   It has been suggested that the `Revert to distributed version
+   It has been suggested that the `
+   It has been suggested that the `Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+   It has been suggested that the `Latest from Cyclic Software
    It has been suggested that the `' keyword should be inserted
 _last_ in the file, and not in the files header, if it is to be used at
 all.  That way the long list of change messages will not interfere with
diff --git a/gnu/usr.bin/cvs/doc/cvs.info-5 b/gnu/usr.bin/cvs/doc/cvs.info-5
index 371dd4ce8e8..47a3dfbe17b 100644
--- a/gnu/usr.bin/cvs/doc/cvs.info-5
+++ b/gnu/usr.bin/cvs/doc/cvs.info-5
@@ -899,8 +899,11 @@ you undo the effect!
      and `Rel' (for released).  By default, the state of a new revision
      is set to `Exp' when it is created.  The state is visible in the
      output from CVS LOG (*note log::), and in the `$Log: cvs.info-5,v $
-     output from CVS LOG (*note log::), and in the `Revision 1.2  2001/09/29 00:00:39  tholo
-     output from CVS LOG (*note log::), and in the `Merge remaining local changes, correct build issues
+     output from CVS LOG (*note log::), and in the `Revision 1.3  2001/09/30 19:44:54  tholo
+     output from CVS LOG (*note log::), and in the `Revert to distributed version
+     output from CVS LOG (*note log::), and in the `
+     output from CVS LOG (*note log::), and in the `Revision 1.1.1.18  2001/09/28 22:48:51  tholo
+     output from CVS LOG (*note log::), and in the `Latest from Cyclic Software
      output from CVS LOG (*note log::), and in the `' and
      `$State: Exp $' keywords (*note Keyword substitution::).  Note that CVS
      uses the `dead' state for its own purposes; to take a file to or
diff --git a/gnu/usr.bin/cvs/doc/cvs.info-7 b/gnu/usr.bin/cvs/doc/cvs.info-7
index 9f375050b04..11e3ba7ceb1 100644
--- a/gnu/usr.bin/cvs/doc/cvs.info-7
+++ b/gnu/usr.bin/cvs/doc/cvs.info-7
@@ -105,9 +105,9 @@ run the `cvs --help' command, or see *Note Index::.
 
    Keyword expansion modes (*note Substitution modes::):
 
-     -kkv  $Id: cvs.info-7,v 1.2 2001/09/29 00:00:39 tholo Exp $
-     -kkvl $Id: cvs.info-7,v 1.2 2001/09/29 00:00:39 tholo Exp $
-     -kk   $Id: cvs.info-7,v 1.2 2001/09/29 00:00:39 tholo Exp $
+     -kkv  $Id: cvs.info-7,v 1.3 2001/09/30 19:44:54 tholo Exp $
+     -kkvl $Id: cvs.info-7,v 1.3 2001/09/30 19:44:54 tholo Exp $
+     -kk   $Id: cvs.info-7,v 1.3 2001/09/30 19:44:54 tholo Exp $
      -kv   file1,v 1.1 1993/12/09 03:21:13 joe Exp
      -ko   no expansion
      -kb   no expansion, file is binary
@@ -115,18 +115,21 @@ run the `cvs --help' command, or see *Note Index::.
    Keywords (*note Keyword list::):
 
      $Author: tholo $
-     $Date: 2001/09/29 00:00:39 $
-     $Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-7,v 1.2 2001/09/29 00:00:39 tholo Exp $
-     $Id: cvs.info-7,v 1.2 2001/09/29 00:00:39 tholo Exp $
+     $Date: 2001/09/30 19:44:54 $
+     $Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-7,v 1.3 2001/09/30 19:44:54 tholo Exp $
+     $Id: cvs.info-7,v 1.3 2001/09/30 19:44:54 tholo Exp $
      $Locker:  $
      $Name:  $
      $RCSfile: cvs.info-7,v $
-     $Revision: 1.2 $
+     $Revision: 1.3 $
      $Source: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.info-7,v $
      $State: Exp $
      $Log: cvs.info-7,v $
-     Revision 1.2  2001/09/29 00:00:39  tholo
-     Merge remaining local changes, correct build issues
+     Revision 1.3  2001/09/30 19:44:54  tholo
+     Revert to distributed version
+
+     Revision 1.1.1.13  2001/09/28 22:48:51  tholo
+     Latest from Cyclic Software
 
      Revision 1.1  1993/12/09 03:30:17  joe
      Initial revision