svn commit: r1335710 - 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 19:34:02 2012
New Revision: 1335710

URL: http://svn.apache.org/viewvc?rev=1335710&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__cmd_table): Scope the 'log -r BASE:HEAD' example to a single file.
    This way it is accurate even for mixed-revision working copies and/or
    switched subtrees.

* 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=1335710&r1=1335709&r2=1335710&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Tue May  8 19:34:02 2012
@@ -691,11 +691,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "    '/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"
+     "    Show the log messages for any incoming changes to foo.c during the\n"
+     "    next 'svn update':\n"
+     "      svn log -r BASE:HEAD foo.c\n"
      "\n"
      "    Show the log message for the revision in which /branches/foo\n"
      "    was created:\n"

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=1335710&r1=1335709&r2=1335710&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 19:34:02 2012
@@ -48,11 +48,9 @@ usage: 1. log [PATH][@REV]
     '/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.)
+    Show the log messages for any incoming changes to foo.c during the
+    next 'svn update':
+      svn log -r BASE:HEAD foo.c
 
     Show the log message for the revision in which /branches/foo
     was created: