Author: julianfoad
Date: Thu Dec 20 01:44:04 2012
New Revision: 1424266
URL: http://svn.apache.org/viewvc?rev=1424266&view=rev
Log:
* subversion/svn/svn.c
(svn_cl__cmd_table): Improve the help for 2-URL merge, among other things
clarifying the direction of the diff to resolve issue #3175 '"svn help
merge" is missing critical information'.
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=1424266&r1=1424265&r2=1424266&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Thu Dec 20 01:44:04 2012
@@ -738,7 +738,7 @@ const svn_opt_subcommand_desc2_t svn_cl_
" (the 'automatic' merge)\n"
" 2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
" (the 'cherry-pick' merge)\n"
-" 3. merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
+" 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n"
" (the '2-URL' merge)\n"
"\n"
" 1. This form, with one source path and no revision range, is called\n"
@@ -923,26 +923,27 @@ const svn_opt_subcommand_desc2_t svn_cl_
"\n"
" 3. This form is called a '2-URL merge':\n"
"\n"
-" svn merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n"
-"\n"
-" Two source URLs are specified, together with two revisions N and M.\n"
-" The two sources are compared at the specified revisions, and the\n"
-" difference is applied to TARGET_WCPATH, which is a path to a working\n"
-" copy of another branch. The three branches involved can be completely\n"
-" unrelated.\n"
+" svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n"
"\n"
" You should use this merge variant only if the other variants do not\n"
" apply to your situation, as this variant can be quite complex to\n"
" master.\n"
"\n"
+" Two source URLs are specified, identifying two trees on the same\n"
+" branch or on different branches. The trees are compared and the\n"
+" difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n"
+" working copy of the target branch at TARGET_WCPATH. The target\n"
+" branch may be the same as one or both sources, or different again.\n"
+" The three branches involved can be completely unrelated.\n"
+"\n"
" If TARGET_WCPATH is omitted, a default value of '.' is assumed.\n"
" However, in the special case where both sources refer to a file node\n"
-" with the same basename and a similarly named file is also found within\n"
-" '.', the differences will be applied to that local file. The source\n"
-" revisions default to HEAD if omitted.\n"
+" with the same name and a file with the same name is also found within\n"
+" '.', the differences will be applied to that local file. The source\n"
+" revisions REV1 and REV2 default to HEAD if omitted.\n"
"\n"
-" The sources can also be specified as working copy paths, in which case\n"
-" the URLs of the merge sources are derived from the working copies.\n"
+" SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n"
+" in which case the merge source URL is derived from the working copy.\n"
"\n"
" - 2-URL Merge Example -\n"
"\n"
