You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2022/01/12 04:00:13 UTC
svn commit: r1896935 - in /subversion/branches/1.14.x: ./ STATUS subversion/svnadmin/svnadmin.c
Author: svn-role
Date: Wed Jan 12 04:00:13 2022
New Revision: 1896935
URL: http://svn.apache.org/viewvc?rev=1896935&view=rev
Log:
Merge r1896877 from trunk:
* r1896877
Fix misleading -r option documentation for some svnadmin subcommands.
Justification:
Documentation should be correct.
Votes:
+1: stsp, dsahlberg, hartmannathan
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1896877
Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1896935&r1=1896934&r2=1896935&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Wed Jan 12 04:00:13 2022
@@ -131,10 +131,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1896877
- Fix misleading -r option documentation for some svnadmin subcommands.
- Justification:
- Documentation should be correct.
- Votes:
- +1: stsp, dsahlberg, hartmannathan
Modified: subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c?rev=1896935&r1=1896934&r2=1896935&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/1.14.x/subversion/svnadmin/svnadmin.c Wed Jan 12 04:00:13 2022
@@ -352,7 +352,8 @@ static const svn_opt_subcommand_desc3_t
"2. Delete the property NAME on transaction TXN.\n"
)},
{'r', 't', svnadmin__use_pre_revprop_change_hook,
- svnadmin__use_post_revprop_change_hook} },
+ svnadmin__use_post_revprop_change_hook},
+ { {'r', "specify revision number ARG"} } },
{"deltify", subcommand_deltify, {0}, {N_(
"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
@@ -541,7 +542,8 @@ static const svn_opt_subcommand_desc3_t
"The size includes revision properties and excludes FSFS indexes.\n"
)},
{'r', 'q', 'M'},
- { {'q', "print only the size and a newline"} } },
+ { {'r', "specify revision number ARG"},
+ {'q', "print only the size and a newline"} }, },
{"rmlocks", subcommand_rmlocks, {0}, {N_(
"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
@@ -570,7 +572,8 @@ static const svn_opt_subcommand_desc3_t
"NOTE: Revision properties are not versioned, so this command will\n"
"overwrite the previous log message.\n"
)},
- {'r', svnadmin__bypass_hooks} },
+ {'r', svnadmin__bypass_hooks},
+ { {'r', "specify revision number ARG"} }, },
{"setrevprop", subcommand_setrevprop, {0}, {N_(
"usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n"
@@ -588,7 +591,8 @@ static const svn_opt_subcommand_desc3_t
"2. Set the property NAME on transaction TXN to the contents of FILE.\n"
)},
{'r', 't', svnadmin__use_pre_revprop_change_hook,
- svnadmin__use_post_revprop_change_hook} },
+ svnadmin__use_post_revprop_change_hook},
+ { {'r', "specify revision number ARG"} }, },
{"setuuid", subcommand_setuuid, {0}, {N_(
"usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n"