subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1442308 - /subversion/trunk/subversion/svn/svn.c
Date Mon, 04 Feb 2013 19:36:46 GMT
Author: stsp
Date: Mon Feb  4 19:36:45 2013
New Revision: 1442308

URL: http://svn.apache.org/viewvc?rev=1442308&view=rev
Log:
* subversion/svn/svn.c
  (svn_cl__cmd_table): Make 'svn help resolve' output easier to understand.
   The previous text implied that the PATH argument was ignored unless
   the --accept option was given, which isn't the case.

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=1442308&r1=1442307&r2=1442308&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Mon Feb  4 19:36:45 2013
@@ -1321,10 +1321,12 @@ const svn_opt_subcommand_desc2_t svn_cl_
     ("Resolve conflicts on working copy files or directories.\n"
      "usage: resolve [PATH...]\n"
      "\n"
-     "  If no arguments are given, perform interactive conflict resolution for\n"
-     "  all conflicted paths in the working copy, with default depth 'infinity'.\n"
-     "  The --accept=ARG option prevents prompting and forces conflicts on PATH\n"
-     "  to resolved in the manner specified by ARG, with default depth 'empty'.\n"),
+     "  By default, perform interactive conflict resolution on PATH.\n"
+     "  In this mode, the command is recursive by default (depth 'infinity').\n"
+     "\n"
+     "  The --accept=ARG option prevents interactive prompting and forces\n"
+     "  conflicts on PATH to be resolved in the manner specified by ARG.\n"
+     "  In this mode, the command is not recursive by default (depth 'empty').\n"),
     {opt_targets, 'R', opt_depth, 'q', opt_accept},
     {{opt_accept, N_("specify automatic conflict resolution source\n"
                      "                             "



Mime
View raw message