Author: julianfoad
Date: Thu Nov 29 17:19:01 2012
New Revision: 1415280
URL: http://svn.apache.org/viewvc?rev=1415280&view=rev
Log:
* subversion/svn/svn.c
(svn_cl__cmd_table): Shorten the 'propset' help text for svn:externals.
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=1415280&r1=1415279&r2=1415280&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Thu Nov 29 17:19:01 2012
@@ -1250,34 +1250,28 @@ 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:externals - A newline separated list of module specifiers,\n"
- " each of which consists of a URL and a relative directory path,\n"
- " similar to the syntax of the 'svn checkout' command:\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"
+ " Example:\n"
" http://example.com/repos/zig foo/bar\n"
- " A revision to check out can optionally be specified to pin the\n"
- " external to a known revision:\n"
+ " The LOCALPATH is relative to the directory having this property.\n"
+ " To pin the external to a known revision, specify the optional
REV:\n"
" -r25 http://example.com/repos/zig foo/bar\n"
- " To unambiguously identify an element at a path which has been\n"
- " deleted (possibly even deleted multiple times in its history),\n"
- " an optional peg revision can be appended to the URL:\n"
+ " To unambiguously identify an element at a path which may have
been\n"
+ " subsequently deleted or renamed, specify the optional PEG
revision:\n"
" -r25 http://example.com/repos/zig@42 foo/bar\n"
- " Relative URLs are indicated by starting the URL with one\n"
- " of the following strings:\n"
+ " The URL may be a full URL or a relative URL starting with one
of:\n"
" ../ to the parent directory of the extracted external\n"
" ^/ to the repository root\n"
- " // to the scheme\n"
" / to the server root\n"
+ " // to the URL scheme\n"
+ " Use of the following format is discouraged but is supported for\n"
+ " interoperability with Subversion 1.4 and earlier clients:\n"
+ " 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 in externals definitions starting with the '#' character\n"
- " are considered comments and are ignored.\n"
- " Subversion 1.4 and earlier only support the following formats\n"
- " where peg revisions can only be specified using a -r modifier\n"
- " and where URLs cannot be relative:\n"
- " foo http://example.com/repos/zig\n";
- " foo/bar -r 1234 http://example.com/repos/zag\n";
- " Use of these formats is discouraged. They should only be used if\n"
- " interoperability with 1.4 clients is desired.\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"
