Author: julianfoad
Date: Thu Nov 29 18:21:18 2012
New Revision: 1415310
URL: http://svn.apache.org/viewvc?rev=1415310&view=rev
Log:
* subversion/svn/svn.c
(svn_cl__cmd_table): In the 'propset' help text, list the properties that
apply to a file separately from those that apply to a directory, for
clarity. Also tweak the wording to say that the 'svn:' name space is
reserved and that it is Subversion not just 'svn' that treats these
properties specially.
Modified:
subversion/trunk/subversion/svn/svn.c
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1415310&r1=1415309&r2=1415310&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Thu Nov 29 18:21:18 2012
@@ -1230,10 +1230,8 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" The value may be provided with the --file option instead of PROPVAL.\n"
"\n"
- " Note: svn recognizes the following special versioned properties\n"
- " but will store any arbitrary properties set:\n"
- " svn:ignore - A newline separated list of file glob patterns to
ignore.\n"
- " svn:global-ignores - Like svn:ignore, but inheritable.\n"
+ " Property names starting with 'svn:' are reserved. Subversion
recognizes\n"
+ " the following special versioned properties on a file:\n"
" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
" URL, HeadURL - The URL for the head version of the
object.\n"
" Author, LastChangedBy - The last person to modify the file.\n"
@@ -1249,6 +1247,15 @@ const svn_opt_subcommand_desc2_t svn_cl_
" whether to merge the file, and how to serve it from Apache.\n"
" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
" treated as text. Anything else is treated as binary.\n"
+ " svn:needs-lock - If present, indicates that the file should be
locked\n"
+ " before it is modified. Makes the working copy file read-only\n"
+ " when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n"
+ " to clear.\n"
+ "\n"
+ " Subversion recognizes the following special versioned properties on
a\n"
+ " directory:\n"
+ " svn:ignore - A newline separated list of file glob patterns to
ignore.\n"
+ " svn:global-ignores - Like svn:ignore, but inheritable.\n"
" svn:externals - A list of module specifiers, one per line, in the\n"
" following format similar to the syntax of 'svn checkout':\n"
" [-r REV] URL[@PEG] LOCALPATH\n"
@@ -1270,16 +1277,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" LOCALPATH [-r PEG] URL\n"
" The ambiguous format 'relative_path relative_path' is taken as\n"
" 'relative_url relative_path' with peg revision support.\n"
- " Lines starting with a '#' character are ignored.\n"
- " svn:needs-lock - If present, indicates that the file should be
locked\n"
- " before it is modified. Makes the working copy file read-only\n"
- " when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n"
- " to clear.\n"
- "\n"
- " The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
- " svn:needs-lock properties cannot be set on a directory. A
non-recursive\n"
- " attempt will fail, and a recursive attempt will set the property\n"
- " only on the file children of the directory.\n"),
+ " Lines starting with a '#' character are ignored.\n"),
{'F', opt_encoding, 'q', 'r', opt_targets, 'R', opt_depth, opt_revprop,
opt_force, opt_changelist },
{{'F', N_("read property value from file ARG")}} },
