Author: julianfoad
Date: Mon Apr 16 14:12:35 2018
New Revision: 1829285
URL: http://svn.apache.org/viewvc?rev=1829285&view=rev
Log:
* subversion/svnadmin/svnadmin.c
(cmd_table): Document use of '--' with the 'freeze' command.
This is a merge of r1828521 from the 'shelve-checkpoint' branch where I
committed it by mistake.
Modified:
subversion/trunk/ (props changed)
subversion/trunk/subversion/svnadmin/svnadmin.c
Propchange: subversion/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 16 14:12:35 2018
@@ -76,7 +76,7 @@
/subversion/branches/revprop-caching-ng:1620597,1620599
/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
/subversion/branches/shelve:1802592-1815226
-/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320,1828508
+/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320,1828508,1828521
/subversion/branches/subtree-mergeinfo:876734-878766
/subversion/branches/svn-auth-x509:1603509-1655900
/subversion/branches/svn-info-detail:1660035-1662618
Modified: subversion/trunk/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1829285&r1=1829284&r2=1829285&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/svnadmin.c (original)
+++ subversion/trunk/subversion/svnadmin/svnadmin.c Mon Apr 16 14:12:35 2018
@@ -385,8 +385,8 @@ static const svn_opt_subcommand_desc3_t
{{'F', N_("write to file ARG instead of stdout")}} },
{"freeze", subcommand_freeze, {0}, {N_(
- "usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n"
- " 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n"
+ "usage: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n"
+ " 2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n"
"\n"), N_(
"1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n"
" Allows safe use of third-party backup tools on a live repository.\n"
@@ -394,6 +394,9 @@ static const svn_opt_subcommand_desc3_t
"2. Like 1 except all repositories listed in FILE are locked. The file\n"
" format is repository paths separated by newlines. Repositories are\n"
" locked in the same order as they are listed in the file.\n"
+ "\n"
+ "The '--' tells svnadmin to stop looking for svnadmin options and pass\n"
+ "all later arguments to PROGRAM even if they begin with '-'.\n"
)},
{'F'},
{{'F', N_("read repository paths from file ARG")}} },
