subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1026444 - in /subversion/trunk/subversion: svn/main.c tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Date Fri, 22 Oct 2010 18:46:30 GMT
Author: cmpilato
Date: Fri Oct 22 18:46:30 2010
New Revision: 1026444

URL: http://svn.apache.org/viewvc?rev=1026444&view=rev
Log:
Followup to r1026434 with some usage message clarifications.

* subversion/svn/main.c
  (svn_cl__cmd_table): Update 'svn switch' usage message to make the
    --relocate case (hopefully) a bit more clear.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
  Update expected test output.

Modified:
    subversion/trunk/subversion/svn/main.c
    subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Modified: subversion/trunk/subversion/svn/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/main.c?rev=1026444&r1=1026443&r2=1026444&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Fri Oct 22 18:46:30 2010
@@ -1126,7 +1126,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
   { "switch", svn_cl__switch, {"sw"}, N_
     ("Update the working copy to a different URL.\n"
      "usage: 1. switch URL[@PEGREV] [PATH]\n"
-     "       2. switch --relocate FROM TO [PATH...]\n"
+     "       2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
      "\n"
      "  1. Update the working copy to mirror a new URL within the repository.\n"
      "     This behavior is similar to 'svn update', and is the way to\n"
@@ -1149,21 +1149,20 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "     targets of this operation.\n"
      "\n"
      "  2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
-     "     This is used when repository's root URL changes (such as a scheme\n"
+     "     This is used when a repository's root URL changes (such as a scheme\n"
      "     or hostname change) but your working copy still reflects the same\n"
-     "     directory within the same repository.\n"
-     "\n"
-     "     FROM is the root URL which will be relocated from.\n"
-     "     You can use 'svn info' to determine the root URL of the current\n"
-     "     working copy directory (look for 'URL:' in its output).\n"
-     "\n"
-     "     TO is the root URL which will be relocated to.\n"
+     "     directory within the same repository.  FROM-PREFIX and TO-PREFIX are\n"
+     "     initial substrings of the working copy's current and new root URLs,\n"
+     "     respectively.  (You may specify the complete old and new root URLs if\n"
+     "     you wish.)  Use 'svn info' to determine the current repository root\n"
+     "     URL of the working copy.\n"
      "\n"
      "  See also 'svn help update' for a list of possible characters\n"
      "  reporting the action taken.\n"
      "\n"
      "  Examples:\n"
      "    svn switch ^/branches/1.x-release\n"
+     "    svn switch --relocate http:// svn://\n"
      "    svn switch --relocate http://www.example.com/repo/project \\\n"
      "                          svn://svn.example.com/repo/project\n"),
     { 'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_relocate,

Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1026444&r1=1026443&r2=1026444&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
(original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Fri Oct 22 18:46:30 2010
@@ -97,7 +97,7 @@ Global options:
 
 switch (sw): Update the working copy to a different URL.
 usage: 1. switch URL[@PEGREV] [PATH]
-       2. switch --relocate FROM TO [PATH...]
+       2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]
 
   1. Update the working copy to mirror a new URL within the repository.
      This behavior is similar to 'svn update', and is the way to
@@ -120,21 +120,20 @@ usage: 1. switch URL[@PEGREV] [PATH]
      targets of this operation.
 
   2. Rewrite working copy URL metadata to reflect a syntactic change only.
-     This is used when repository's root URL changes (such as a scheme
+     This is used when a repository's root URL changes (such as a scheme
      or hostname change) but your working copy still reflects the same
-     directory within the same repository.
-
-     FROM is the root URL which will be relocated from.
-     You can use 'svn info' to determine the root URL of the current
-     working copy directory (look for 'URL:' in its output).
-
-     TO is the root URL which will be relocated to.
+     directory within the same repository.  FROM-PREFIX and TO-PREFIX are
+     initial substrings of the working copy's current and new root URLs,
+     respectively.  (You may specify the complete old and new root URLs if
+     you wish.)  Use 'svn info' to determine the current repository root
+     URL of the working copy.
 
   See also 'svn help update' for a list of possible characters
   reporting the action taken.
 
   Examples:
     svn switch ^/branches/1.x-release
+    svn switch --relocate http:// svn://
     svn switch --relocate http://www.example.com/repo/project \
                           svn://svn.example.com/repo/project
 



Mime
View raw message