From ee0aacd375d49654955c5acd74a3cdbe5e798bc1 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@FreeBSD.org>
Date: Wed, 11 Jul 2001 13:22:17 +0000
Subject: [PATCH] Add more details about the "cvs log" command.

PR:		docs/28730
Submitted by:	Giorgos Keramidas <keramida@ceid.upatras.gr>
---
 .../articles/committers-guide/article.sgml    | 40 ++++++++++++++++---
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml
index b282a70c69..6865c416cb 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.sgml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml
@@ -19,7 +19,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.73 2001/06/22 08:18:55 nik Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.74 2001/07/08 01:17:53 dd Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -519,11 +519,11 @@
         </itemizedlist>
 
         <para>You'll almost certainly get a conflict because
-          of the <literal>$Id: article.sgml,v 1.74 2001-07-08 01:17:53 dd Exp $</literal> (or in FreeBSD's case,
+          of the <literal>$Id: article.sgml,v 1.75 2001-07-11 13:22:17 nik Exp $</literal> (or in FreeBSD's case,
           <literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
           the file to resolve the conflict (remove the marker lines and
-          the second <literal>$Id: article.sgml,v 1.74 2001-07-08 01:17:53 dd Exp $</literal> line, leaving the original
-          <literal>$Id: article.sgml,v 1.74 2001-07-08 01:17:53 dd Exp $</literal> line intact).</para>
+          the second <literal>$Id: article.sgml,v 1.75 2001-07-11 13:22:17 nik Exp $</literal> line, leaving the original
+          <literal>$Id: article.sgml,v 1.75 2001-07-11 13:22:17 nik Exp $</literal> line intact).</para>
       </listitem>
 
       <listitem>
@@ -580,8 +580,38 @@
         <para>View log entries with the <literal>log</literal>
           command.</para>
 
-        <!-- XXX needs more details -->
         <screen>&prompt.user; <userinput>cvs log shazam</userinput></screen>
+
+        <para>If <filename>shazam</filename> is a file, this will print a
+          <emphasis>header</emphasis> with information about this file, such
+          as where in the repository this file is stored, which revision is
+          the <literal>HEAD</literal> for this file, what branches this file
+          is in, and any tags that are valid for this file.  Then, for each
+          revision of this file, a log message is printed.  This includes
+          the date and time of the commit, who did the commit, how many lines
+          were added and/or deleted, and finally the log message that the
+          committer who did the change wrote.</para>
+
+        <para>If <filename>shazam</filename> is a directory, then the log
+          information described above is printed for each file in the
+          directory in turn.  Unless you give the <option>-l</option> to
+          <literal>log</literal>, the log for all subdirectories of
+          <filename>shazam</filename> is printed too, in a recursive
+          manner.</para>
+
+        <para>Use the <literal>log</literal> command to view the history of
+          one or more files, as it's stored in the CVS repository.  You can
+          even use it to view the log message of a specific revision, if you
+          add the <option>-r<replaceable>rev</replaceable></option> to the
+          <literal>log</literal> command:</para>
+
+        <screen>&prompt.user; <userinput>cvs log -r1.2 shazam</userinput></screen>
+
+        <para>This will print only the log message for revision
+          <literal>1.2</literal> of file <filename>shazam</filename> if it is
+          a file, or the log message for revision <literal>1.2</literal> of
+          each file under <filename>shazam</filename> if it is a
+          directory.</para>
       </listitem>
 
       <listitem>