Author: julianfoad
Date: Mon Oct 25 10:21:27 2010
New Revision: 1027029
URL: http://svn.apache.org/viewvc?rev=1027029&view=rev
Log:
* subversion/svn/main.c
(svn_cl__options): Remove the alias '--nul' (for --no-unlock/--keep-lock),
in order to have at most one alias per option, and because I didn't
like its name.
Modified:
subversion/trunk/subversion/svn/main.c
Modified: subversion/trunk/subversion/svn/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1027029&r1=1027028&r2=1027029&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Mon Oct 25 10:21:27 2010
@@ -293,7 +293,7 @@ const apr_getopt_option_t svn_cl__option
{"limit", 'l', 1, N_("maximum number of log entries")},
{"no-unlock", opt_no_unlock, 0, N_("don't unlock the targets\n"
SVN_CL__OPTION_CONTINUATION_INDENT
- "[aliases: --nul, --keep-lock]")},
+ "[alias: --keep-lock]")},
{"summarize", opt_summarize, 0, N_("show a summary of the results")},
{"remove", opt_remove, 0, N_("remove changelist association")},
{"changelist", opt_changelist, 1,
@@ -425,7 +425,6 @@ const apr_getopt_option_t svn_cl__option
{"iw", opt_ignore_whitespace, 0, NULL},
{"diff", opt_show_diff, 0, NULL},
{"idiff", opt_internal_diff, 0, NULL},
- {"nul", opt_no_unlock, 0, NULL},
{"keep-lock", opt_no_unlock, 0, NULL},
{"optn", opt_old_patch_target_names, 0, NULL},
