svn commit: r1335666 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

[st...@apache.org]

Author: stsp
Date: Tue May  8 18:05:09 2012
New Revision: 1335666

URL: http://svn.apache.org/viewvc?rev=1335666&view=rev
Log:
Revise examples shown in the output of 'svn help log'.

* subversion/svn/main.c
  (svn_cl__cmd_table): Provide more useful examples and explain the purpose
    of each example in detail.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
   Adjust expected output.

Modified:
    subversion/trunk/subversion/svn/main.c
    subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1335666&r1=1335665&r2=1335666&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Tue May  8 18:05:09 2012
@@ -674,19 +674,31 @@ const svn_opt_subcommand_desc2_t svn_cl_
 
      "\n"
      "  Examples:\n"
-     "    svn log\n"
-     "    svn log foo.c\n"
-     "    svn log bar.c@42\n"
-     "    svn log http://www.example.com/repo/project/foo.c\n"
-     "    svn log http://www.example.com/repo/project foo.c bar.c\n"
-     "    svn log http://www.example.com/repo/project@50 foo.c bar.c\n"
      "\n"
-     "    This command shows the log messages for any incoming changes\n"
-     "    the next 'svn update' will apply:\n"
+     "    Show the latest 5 log messages for the current working copy\n"
+     "    directory and display paths changed in each commit:\n"
+     "      svn log -l 5 -v\n"
+     "\n"
+     "    Show the log for bar.c as of revision 42:\n"
+     "      svn log bar.c@42\n"
+     "\n"
+     "    Show log messages and diffs for each commit to foo.c:\n"
+     "      svn log --diff http://www.example.com/repo/project/foo.c\n"
+     "    (Because the above command uses a full URL it does not require\n"
+     "     a working copy.)\n"
+     "\n"
+     "    Show log messages for the children foo.c and bar.c of the directory\n"
+     "    '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n"
+     "      svn log ^/trunk@50 foo.c bar.c\n"
+     "\n"
+     "    Show the log messages for any incoming changes the next 'svn update'\n"
+     "    command will apply to the current working copy directory:\n"
      "      svn log -rBASE:HEAD\n"
+     "    (The above applies to the current directory only; Use 'svn status -u'\n"
+     "     to learn about incoming changes for the entire working copy.)\n"
      "\n"
-     "    This command shows the log entry for the revision the branch\n"
-     "    ^/branches/foo was created in:\n"
+     "    Show the log message for the revision in which /branches/foo\n"
+     "    was created:\n"
      "      svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n"),
     {'r', 'q', 'v', 'g', 'c', opt_targets, opt_stop_on_copy, opt_incremental,
      opt_xml, 'l', opt_with_all_revprops, opt_with_no_revprops, opt_with_revprop,

Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1335666&r1=1335665&r2=1335666&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout Tue May  8 18:05:09 2012
@@ -31,19 +31,31 @@ usage: 1. log [PATH][@REV]
   and limits the scope of the displayed diff to the specified depth.
 
   Examples:
-    svn log
-    svn log foo.c
-    svn log bar.c@42
-    svn log http://www.example.com/repo/project/foo.c
-    svn log http://www.example.com/repo/project foo.c bar.c
-    svn log http://www.example.com/repo/project@50 foo.c bar.c
 
-    This command shows the log messages for any incoming changes
-    the next 'svn update' will apply:
+    Show the latest 5 log messages for the current working copy
+    directory and display paths changed in each commit:
+      svn log -l 5 -v
+
+    Show the log for bar.c as of revision 42:
+      svn log bar.c@42
+
+    Show log messages and diffs for each commit to foo.c:
+      svn log --diff http://www.example.com/repo/project/foo.c
+    (Because the above command uses a full URL it does not require
+     a working copy.)
+
+    Show log messages for the children foo.c and bar.c of the directory
+    '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:
+      svn log ^/trunk@50 foo.c bar.c
+
+    Show the log messages for any incoming changes the next 'svn update'
+    command will apply to the current working copy directory:
       svn log -rBASE:HEAD
+    (The above applies to the current directory only; Use 'svn status -u'
+     to learn about incoming changes for the entire working copy.)
 
-    This command shows the log entry for the revision the branch
-    ^/branches/foo was created in:
+    Show the log message for the revision in which /branches/foo
+    was created:
       svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo
 
 Valid options: