Author: danielsh
Date: Sat Nov 26 18:06:49 2011
New Revision: 1206523
URL: http://svn.apache.org/viewvc?rev=1206523&view=rev
Log:
--accept: document the value "working" and the shorthands in the help text.
* subversion/svn/main.c
(svn_cl__options.--accept): Update help text.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
Update 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=1206523&r1=1206522&r2=1206523&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Sat Nov 26 18:06:49 2011
@@ -301,11 +301,14 @@ const apr_getopt_option_t svn_cl__option
{"accept", opt_accept, 1,
N_("specify automatic conflict resolution action\n"
" "
- "('postpone', 'base', 'mine-conflict',\n"
+ "('postpone', 'working', 'base', 'mine-conflict',\n"
" "
"'theirs-conflict', 'mine-full', 'theirs-full',\n"
" "
- "'edit', 'launch')")},
+ "'edit', 'launch')\n"
+ " "
+ "(shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')\n"
+ )},
{"show-revs", opt_show_revs, 1,
N_("specify which collection of revisions to display\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=1206523&r1=1206522&r2=1206523&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
Sat Nov 26 18:06:49 2011
@@ -157,9 +157,10 @@ Valid options:
--ignore-ancestry : ignore ancestry when calculating merges
--force : force operation to run
--accept ARG : specify automatic conflict resolution action
- ('postpone', 'base', 'mine-conflict',
+ ('postpone', 'working', 'base', 'mine-conflict',
'theirs-conflict', 'mine-full', 'theirs-full',
'edit', 'launch')
+ (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')
Global options:
--username ARG : specify a username ARG
