Author: svn-role
Date: Wed Dec 16 04:00:11 2020
New Revision: 1884481
URL: http://svn.apache.org/viewvc?rev=1884481&view=rev
Log:
Merge r1882157 from trunk:
* r1882157
Do not suggest --help -v for commands which do not support -v.
Justification:
The --help message for several commands is misleading. User complained.
Votes:
+1: stsp, brane, jcorvel
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_subr/opt.c
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1882157
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1884481&r1=1884480&r2=1884481&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Dec 16 04:00:11 2020
@@ -111,13 +111,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1882157
- Do not suggest --help -v for commands which do not support -v.
- Justification:
- The --help message for several commands is misleading. User complained.
- Votes:
- +1: stsp, brane, jcorvel
-
* r1877338
Add SWIG4 support for SWIG Python binding on Windows.
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_subr/opt.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_subr/opt.c?rev=1884481&r1=1884480&r2=1884481&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_subr/opt.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_subr/opt.c Wed Dec 16 04:00:11
2020
@@ -326,7 +326,7 @@ print_command_info3(const svn_opt_subcom
}
}
- if (!verbose)
+ if (!verbose && global_options && *global_options)
SVN_ERR(svn_cmdline_fputs(_("\n(Use '-v' to show global and
experimental options.)\n"),
stream, pool));
if (have_options)
