Author: julianfoad
Date: Tue Jul 25 19:19:56 2017
New Revision: 1802989
URL: http://svn.apache.org/viewvc?rev=1802989&view=rev
Log:
Make 'svn help' more consistent when showing deprecated options.
* subversion/svn/svn.c
(svn_cl__cmd_table): For each of 'mv' and 'sw', move a deprecated option
to the end of the list and override its help text to say so.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Adjust the expected output accordingly.
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=1802989&r1=1802988&r2=1802989&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Tue Jul 25 19:19:56 2017
@@ -1329,11 +1329,10 @@ const svn_opt_subcommand_desc2_t svn_cl_
" Furthermore, WC -> WC moves will refuse to move a mixed-revision
subtree.\n"
" To avoid unnecessary conflicts, it is recommended to run 'svn
update'\n"
" to update the subtree to a single revision before moving it.\n"
- " The --allow-mixed-revisions option is provided for backward
compatibility.\n"
- "\n"
- " The --revision option has no use and is deprecated.\n"),
- {'r', 'q', opt_force, opt_parents, opt_allow_mixed_revisions,
- SVN_CL__LOG_MSG_OPTIONS} },
+ " The --allow-mixed-revisions option is provided for backward
compatibility.\n"),
+ {'q', opt_force, opt_parents, opt_allow_mixed_revisions,
+ SVN_CL__LOG_MSG_OPTIONS, 'r'},
+ {{'r', "deprecated and ignored"}} },
{ "patch", svn_cl__patch, {0}, N_
("Apply a patch to a working copy.\n"
@@ -1781,12 +1780,14 @@ const svn_opt_subcommand_desc2_t svn_cl_
" svn switch --relocate http:// svn://\n"
" svn switch --relocate http://www.example.com/repo/project \\\n"
" svn://svn.example.com/repo/project\n"),
- { 'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_relocate,
- opt_ignore_externals, opt_ignore_ancestry, opt_force, opt_accept},
+ { 'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd,
+ opt_ignore_externals, opt_ignore_ancestry, opt_force, opt_accept,
+ opt_relocate },
{{opt_ignore_ancestry,
N_("allow switching to a node with no common ancestor")},
{opt_force,
- N_("handle unversioned obstructions as changes")}}
+ N_("handle unversioned obstructions as changes")},
+ {opt_relocate,N_("deprecated; use 'svn relocate'")}}
},
{ "unlock", svn_cl__unlock, {0}, 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=1802989&r1=1802988&r2=1802989&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
Tue Jul 25 19:19:56 2017
@@ -209,7 +209,6 @@ Valid options:
'empty', 'files', 'immediates', or 'infinity')
-q [--quiet] : print nothing, or only summary information
--diff3-cmd ARG : use ARG as merge command
- --relocate : relocate via URL-rewriting
--ignore-externals : ignore externals definitions
--ignore-ancestry : allow switching to a node with no common ancestor
--force : handle unversioned obstructions as changes
@@ -218,6 +217,7 @@ Valid options:
'theirs-conflict', 'mine-full', 'theirs-full',
'edit', 'launch')
(shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')
+ --relocate : deprecated; use 'svn relocate'
Global options:
--username ARG : specify a username ARG
