subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1209654 - /subversion/trunk/subversion/svn/main.c
Date Fri, 02 Dec 2011 19:46:10 GMT
Author: stsp
Date: Fri Dec  2 19:46:10 2011
New Revision: 1209654

URL: http://svn.apache.org/viewvc?rev=1209654&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__cmd_table): Don't use zero-based indexing when enumerating the
   different syntax forms in the 'svn merge' help text. This is inconsistent
   with all other help texts which always start counting at 1.
   Zero-based indexing was added in r1195480 when the previously combined
   'sync' and 'cherry-pick' syntax forms were split up.

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=1209654&r1=1209653&r2=1209654&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Fri Dec  2 19:46:10 2011
@@ -678,16 +678,16 @@ const svn_opt_subcommand_desc2_t svn_cl_
        * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw'
        * (with quotes and newlines removed). */
 "Merge changes into a working copy.\n"
-"usage: 0. merge SOURCE[@REV] [TARGET_WCPATH]\n"
+"usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n"
 "          (the 'sync' merge)\n"
-"       1. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
+"       2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
 "          (the 'cherry-pick' merge)\n"
-"       2. merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n"
+"       3. merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n"
 "          (the 'reintegrate' merge)\n"
-"       3. merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
+"       4. merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
 "          (the '2-URL' merge)\n"
 "\n"
-"  0. This form is called a 'sync' (or 'catch-up') merge:\n"
+"  1. This form is called a 'sync' (or 'catch-up') merge:\n"
 "\n"
 "       svn merge SOURCE[@REV] [TARGET_WCPATH]\n"
 "\n"
@@ -749,7 +749,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
 "     conflicts before you commit the merge.\n"
 "\n"
 "\n"
-"  1. This form is called a 'cherry-pick' merge:\n"
+"  2. This form is called a 'cherry-pick' merge:\n"
 "\n"
 "       svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
 "\n"
@@ -818,7 +818,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
 "         svn merge -c50,54,60 -r65:68 ^/trunk\n"
 "\n"
 "\n"
-"  2. This form is called a 'reintegrate merge':\n"
+"  3. This form is called a 'reintegrate merge':\n"
 "\n"
 "       svn merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n"
 "\n"
@@ -877,7 +877,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
 "     on the feature branch, it should be deleted and then re-created.\n"
 "\n"
 "\n"
-"  3. This form is called a '2-URL merge':\n"
+"  4. This form is called a '2-URL merge':\n"
 "\n"
 "       svn merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
 "\n"



Mime
View raw message