svn commit: r1802557 - /subversion/trunk/subversion/svn/svn.c

[ju...@apache.org]

Author: julianfoad
Date: Fri Jul 21 09:52:22 2017
New Revision: 1802557

URL: http://svn.apache.org/viewvc?rev=1802557&view=rev
Log:
In 'svn help lock/unlock', document the '--force' option (steal or break
locks) more clearly.

* subversion/svn/svn.c
  (svn_cl__cmd_table): Clarify the lock/unlock --force option.

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=1802557&r1=1802556&r2=1802557&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Fri Jul 21 09:52:22 2017
@@ -806,11 +806,12 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "no other user can commit changes to them.\n"
      "usage: lock TARGET...\n"
      "\n"
-     "  Use --force to steal the lock from another user or working copy.\n"),
+     "  Use --force to steal a lock from another user or working copy.\n"),
     { opt_targets, 'm', 'F', opt_force_log, opt_encoding, opt_force, 'q' },
     {{'F', N_("read lock comment from file ARG")},
      {'m', N_("specify lock comment ARG")},
-     {opt_force_log, N_("force validity of lock comment source")}} },
+     {opt_force_log, N_("force validity of lock comment source")},
+     {opt_force, N_("steal locks")}} },
 
   { "log", svn_cl__log, {0}, N_
     ("Show the log messages for a set of revision(s) and/or path(s).\n"
@@ -1779,8 +1780,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
     ("Unlock working copy paths or URLs.\n"
      "usage: unlock TARGET...\n"
      "\n"
-     "  Use --force to break the lock.\n"),
-    { opt_targets, opt_force, 'q' } },
+     "  Use --force to break a lock held by another user or working copy.\n"),
+    { opt_targets, opt_force, 'q' },
+    {{opt_force, N_("break locks")}} },
 
   { "update", svn_cl__update, {"up"},  N_
     ("Bring changes from the repository into the working copy.\n"