You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/12 15:18:55 UTC
svn commit: r1383925 - in /subversion/trunk/subversion: svn/main.c
tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Author: stsp
Date: Wed Sep 12 13:18:54 2012
New Revision: 1383925
URL: http://svn.apache.org/viewvc?rev=1383925&view=rev
Log:
* subversion/svn/main.c
(svn_cl__options): Try to use less misleading wording in the 'svn help log'
description of the --search-and option ("the previous/combined pattern"
vs. "any previous/combined pattern").
* 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=1383925&r1=1383924&r2=1383925&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Sep 12 13:18:54 2012
@@ -385,7 +385,7 @@ const apr_getopt_option_t svn_cl__option
N_("like --search, but case-insensitive")},
{"search-and", opt_search_and, 1,
- N_("combine ARG with any previous search pattern\n"
+ N_("combine ARG with the previous search pattern\n"
" "
"Combined search patterns match unitedly.")},
@@ -705,8 +705,8 @@ const svn_opt_subcommand_desc2_t svn_cl_
" If multiple --search options are provided, a log message is shown if\n"
" it matches any of the provided search patterns. If the --search-and\n"
" option is used, that option's argument is combined with the pattern\n"
- " from any previous --search or --search-and option, and a log message\n"
- " is shown only if it matches any of the combined search patterns.\n"
+ " from the previous --search or --search-and option, and a log message\n"
+ " is shown only if it matches the combined search pattern.\n"
" If --limit is used in combination with --search, --limit restricts the\n"
" number of log messages searched, rather than restricting the output\n"
" to a particular number of matching log messages.\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=1383925&r1=1383924&r2=1383925&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:18:54 2012
@@ -40,8 +40,8 @@ usage: 1. log [PATH][@REV]
If multiple --search options are provided, a log message is shown if
it matches any of the provided search patterns. If the --search-and
option is used, that option's argument is combined with the pattern
- from any previous --search or --search-and option, and a log message
- is shown only if it matches any of the combined search patterns.
+ from the previous --search or --search-and option, and a log message
+ is shown only if it matches the combined search pattern.
If --limit is used in combination with --search, --limit restricts the
number of log messages searched, rather than restricting the output
to a particular number of matching log messages.
@@ -117,7 +117,7 @@ Valid options:
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 any previous search pattern
+ --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