subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r981653 - /subversion/trunk/subversion/svn/main.c
Date Mon, 02 Aug 2010 18:26:19 GMT
Author: stsp
Date: Mon Aug  2 18:26:18 2010
New Revision: 981653

URL: http://svn.apache.org/viewvc?rev=981653&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__cmd_table): Tweak documentation svn:externals within the help
   text of 'svn propset'. Rather than explaining the old (1.4 and earlier)
   syntax first, and then explaining how the new 1.5 syntax works, move the
   description of the old syntax to the very end, explain its shortcomings
   there, and discourage its use. Mention that the new syntax is similar to
   the syntax of 'svn checkout' to help people remember it better.

See here for related discussion:

  Date: Fri, 9 Jul 2010 15:08:35 -0400
  From: Nico Kadel-Garcia
  To: users@
  Subject: Unclear syntax for relative addressing of svn:externals, on RHEL 5,
           subversion-1.6.12
  Message-ID: <AANLkTikWq8T7I4uxyz_IgAO9S_OBqNE-YGKYtP0Iu7kN@mail.gmail.com>
  http://svn.haxx.se/users/archive-2010-07/0192.shtml

Suggested by: Nico Kadel-Garcia

Modified:
    subversion/trunk/subversion/svn/main.c

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=981653&r1=981652&r2=981653&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Mon Aug  2 18:26:18 2010
@@ -934,20 +934,14 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "      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 relative directory path, optional\n"
-     "      revision flags and an URL.  The ordering of the three elements\n"
-     "      implements different behavior.  Subversion 1.4 and earlier only\n"
-     "      support the following formats and the URLs cannot have peg\n"
-     "      revisions:\n"
-     "        foo             http://example.com/repos/zig\n"
-     "        foo/bar -r 1234 http://example.com/repos/zag\n"
-     "      Subversion 1.5 and greater support the above formats and the\n"
-     "      following formats where the URLs may have peg revisions:\n"
-     "                http://example.com/repos/zig@42 foo\n"
-     "        -r 1234 http://example.com/repos/zig foo/bar\n"
-     "      Relative URLs are supported in Subversion 1.5 and greater for\n"
-     "      all above formats and are indicated by starting the URL with one\n"
-     "      of the following strings\n"
+     "      each of which consists of a URL and a relative directory path,\n"
+     "      similar to the syntax of the 'svn checkout' command:\n"
+     "        http://example.com/repos/zag foo/bar\n"
+     "      An optional peg revision may be appended to the URL to pin the\n"
+     "      external to a known revision:\n"
+     "        http://example.com/repos/zig@42 foo\n"
+     "      Relative URLs are indicated by starting the URL with one\n"
+     "      of the following strings:\n"
      "        ../  to the parent directory of the extracted external\n"
      "        ^/   to the repository root\n"
      "        //   to the scheme\n"
@@ -956,6 +950,13 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "      '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"
      "    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"



Mime
View raw message