Author: stefan2
Date: Mon Dec 4 11:34:20 2017
New Revision: 1817083
URL: http://svn.apache.org/viewvc?rev=1817083&view=rev
Log:
Follow-up to r1817053: Fix help formatting and tests.
* subversion/svn/svn.c
(svn_cl__options): Add missing newline.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
Update test expectations.
Modified:
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1817083&r1=1817082&r2=1817083&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Mon Dec 4 11:34:20 2017
@@ -407,7 +407,7 @@ const apr_getopt_option_t svn_cl__option
{"search", opt_search, 1,
N_("use ARG as search pattern (glob syntax, case-\n"
" "
- "and accent-insensitive, may require quotation marks"
+ "and accent-insensitive, may require quotation marks\n"
" "
"to prevent shell expansion)")},
{"search-and", opt_search_and, 1,
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=1817083&r1=1817082&r2=1817083&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
Mon Dec 4 11:34:20 2017
@@ -127,7 +127,8 @@ Valid options:
-U ARG, --context ARG: Show ARG lines of context
-p, --show-c-function: Show C function name
--search ARG : use ARG as search pattern (glob syntax, case-
- and accent-insensitive)
+ and accent-insensitive, may require quotation
marks
+ to prevent shell expansion)
--search-and ARG : combine ARG with the previous search pattern
Global options:
