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

[st...@apache.org]

Author: stsp
Date: Wed Sep 12 13:25:13 2012
New Revision: 1383927

URL: http://svn.apache.org/viewvc?rev=1383927&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__options): Shorten descriptions of the --search and --search-and
   options to fit on a single line. The information removed is already
   contained within the general 'svn help log' text.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout: Adjust
   accordingly.

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=1383927&r1=1383926&r2=1383927&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Sep 12 13:25:13 2012
@@ -377,17 +377,11 @@ const apr_getopt_option_t svn_cl__option
                        "                             "
                        "fixed revision. (See the svn:externals property)")},
   {"search", opt_search, 1,
-                       N_("use ARG as search pattern (glob syntax)\n"
-                       "                             "
-                       "Multiple search patterns match independently.")},
-
+                       N_("use ARG as search pattern (glob syntax)")},
   {"isearch", opt_isearch, 1,
                        N_("like --search, but case-insensitive")}, 
-
   {"search-and", opt_search_and, 1,
-                       N_("combine ARG with the previous search pattern\n"
-                       "                             "
-                       "Combined search patterns match unitedly.")},
+                       N_("combine ARG with the previous search pattern")},
 
   {"isearch-and", opt_isearch_and, 1,
                        N_("like --search-and, but case-insensitive")}, 

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=1383927&r1=1383926&r2=1383927&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 Wed Sep 12 13:25:13 2012
@@ -116,9 +116,7 @@ Valid options:
                                 -p (--show-c-function):
                                    Show C function name in diff output.
   --search ARG             : use ARG as search pattern (glob syntax)
-                             Multiple search patterns match independently.
   --search-and ARG         : combine ARG with the previous search pattern
-                             Combined search patterns match unitedly.
   --isearch ARG            : like --search, but case-insensitive
   --isearch-and ARG        : like --search-and, but case-insensitive