subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1066471 - /subversion/trunk/subversion/svn/main.c
Date Wed, 02 Feb 2011 14:06:53 GMT
Author: stsp
Date: Wed Feb  2 14:06:52 2011
New Revision: 1066471

URL: http://svn.apache.org/viewvc?rev=1066471&view=rev
Log:
* subversion/svn/main.c
  (svn_cl__cmd_table): Improve documentation of merge source parameter
   for sync and cherry-picking merges.

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=1066471&r1=1066470&r2=1066471&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/main.c (original)
+++ subversion/trunk/subversion/svn/main.c Wed Feb  2 14:06:52 2011
@@ -687,13 +687,14 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "     A cherry-picking merge is used to merge specific revisions from\n"
      "     one branch to another.\n"
      "\n"
+     "     SOURCE is usually a URL. The source of a cherry-picking merge can\n"
+     "     also be a working copy path, in which case the corresponding URL\n"
+     "     of the path is used.\n"
+     "\n"
      "     If REV is specified, it is used as the peg revision for SOURCE,\n"
      "     i.e. SOURCE is looked up in the repository at revision REV.\n"
      "     If REV is not specified, the HEAD revision is assumed.\n"
      "\n"
-     "     The source of a cherry pick merge can also be a working copy path,\n"
-     "     in which case the corresponding URL of the path is used.\n"
-     "\n"
      "     TARGET_WCPATH is a working copy of the branch the changes will\n"
      "     be applied to.\n"
      "\n"



Mime
View raw message