Author: stsp
Date: Mon Oct 25 19:46:13 2010
New Revision: 1027245
URL: http://svn.apache.org/viewvc?rev=1027245&view=rev
Log:
* subversion/svn/main.c
(svn_cl__options): Rename the --show-diff option to just --diff, and
remove --diff from the long alias list.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout:
Adjust accordingly.
Suggested by: danielsh
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=1027245&r1=1027244&r2=1027245&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Mon Oct 25 19:46:13 2010
@@ -327,7 +327,7 @@ const apr_getopt_option_t svn_cl__option
N_("apply the unidiff in reverse")},
{"ignore-whitespace", opt_ignore_whitespace, 0,
N_("ignore whitespace during pattern matching")},
- {"show-diff", opt_show_diff, 0,
+ {"diff", opt_show_diff, 0,
N_("produce diff output")},
{"internal-diff", opt_internal_diff, 0,
N_("override diff-cmd specified in config file")},
@@ -359,7 +359,6 @@ const apr_getopt_option_t svn_cl__option
{"sca", opt_show_copies_as_adds, 0, NULL},
{"ik", opt_ignore_keywords, 0, NULL},
{"iw", opt_ignore_whitespace, 0, NULL},
- {"diff", opt_show_diff, 0, NULL},
{"idiff", opt_internal_diff, 0, NULL},
{"keep-locks", opt_no_unlock, 0, NULL},
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=1027245&r1=1027244&r2=1027245&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 Oct 25 19:46:13 2010
@@ -57,7 +57,7 @@ Valid options:
--with-all-revprops : retrieve all revision properties
--with-no-revprops : retrieve no revision properties
--with-revprop ARG : retrieve revision property ARG
- --show-diff [--diff] : produce diff output
+ --diff : produce diff output
--diff-cmd ARG : use ARG as diff command
--internal-diff [--idiff] : override diff-cmd specified in config file
-x [--extensions] ARG : Default: '-u'. When Subversion is invoking an
