You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Neels J Hofmeyr <ne...@elego.de> on 2011/11/30 23:23:18 UTC
Re: svn commit: r1208840 - /subversion/trunk/subversion/svn/main.c
Just noting that I have more tweaks in the pipeline which are more
elaborate, time consuming and debatable. So I'm not updating other locations
yet. (like s.a.o/docs/svnmerge.txt)
~Neels
On 11/30/2011 11:18 PM, neels@apache.org wrote:
> Author: neels
> Date: Wed Nov 30 22:18:45 2011
> New Revision: 1208840
>
> URL: http://svn.apache.org/viewvc?rev=1208840&view=rev
> Log:
> * subversion/svn/main.c (svn_cl__cmd_table):
> Fix 'merge' cmdline help: ascii art indentation (x2), stick with
> 'cherry-pick' vs. 'cherry-picking' (x2), 'a' should be 'as',
> tweak one punctuation choice, and remove an extraneous 'is'.
>
> 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=1208840&r1=1208839&r2=1208840&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/svn/main.c (original)
> +++ subversion/trunk/subversion/svn/main.c Wed Nov 30 22:18:45 2011
> @@ -716,10 +716,10 @@ const svn_opt_subcommand_desc2_t svn_cl_
> " diagram, and the last of them was done when HEAD was r100, and now\n"
> " HEAD is r200.\n"
> "\n"
> - " feature +------------------------o-----\n"
> - " / ^\n"
> - " / /\n"
> - " / .............../\n"
> + " feature +------------------------o-----\n"
> + " / ^\n"
> + " / /\n"
> + " / ............../\n"
> " trunk ------+------------L--------------R------\n"
> " r100 r200\n"
> "\n"
> @@ -741,7 +741,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> "\n"
> " svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
> "\n"
> - " A cherry-picking merge is used to merge specific revisions (or\n"
> + " A cherry-pick merge is used to merge specific revisions (or\n"
> " revision ranges) from one branch to another. By default, this form\n"
> " of merge uses merge tracking to avoid re-merging any of the specified\n"
> " revisions that have already been merged. If the --ignore-ancestry\n"
> @@ -770,7 +770,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> " Multiple '-c' and/or '-r' options may be specified and mixing of\n"
> " forward and reverse ranges is allowed.\n"
> "\n"
> - " - Cherry-picking Merge Example -\n"
> + " - Cherry-pick Merge Example -\n"
> "\n"
> " A bug has been fixed on trunk on revision 50. This fix needs to\n"
> " be merged from the trunk into the release branch.\n"
> @@ -803,7 +803,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> " svn merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n"
> "\n"
> " SOURCE is the URL of a branch to be merged back into (usually) its\n"
> - " immediate ancestor branch. If REV is specified, it is used a\n"
> + " immediate ancestor branch. If REV is specified, it is used as\n"
> " the peg revision for SOURCE, i.e. SOURCE is looked up in the\n"
> " repository at revision REV. If REV is not specified, the HEAD\n"
> " revision is assumed.\n"
> @@ -823,10 +823,10 @@ const svn_opt_subcommand_desc2_t svn_cl_
> " the feature, and no other changes. These changes are applied to\n"
> " the trunk.\n"
> "\n"
> - " feature +-------------------------------R\n"
> - " / . \\\n"
> - " / .............. \\\n"
> - " / . v\n"
> + " feature +--------------------------------R\n"
> + " / . \\\n"
> + " / .............. \\\n"
> + " / . v\n"
> " trunk ------+--------------------L------------------o\n"
> " rW rX\n"
> "\n"
> @@ -867,7 +867,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> "\n"
> " If TARGET_WCPATH is omitted, a default value of '.' is assumed,\n"
> " unless the sources have identical basenames that match a file\n"
> - " within '.'; In which case, the differences will be applied to\n"
> + " within '.', in which case the differences will be applied to\n"
> " that file.\n"
> "\n"
> " The sources can also be specified as working copy paths, in which\n"
> @@ -905,7 +905,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
> " feature +-----------------------------------R\n"
> "\n"
> " In the diagram above, L marks the left side of the merge (trunk@500),\n"
> - " and R marks the right side of the merge is (feature@HEAD).\n"
> + " and R marks the right side of the merge (feature@HEAD).\n"
> " The difference between the left and right side is merged into the target.\n"
> "\n"
> " To perform the merge, check out a working copy of the 3.x-release\n"
>
>