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

[rh...@apache.org]

Author: rhuijben
Date: Sat Mar 15 10:56:17 2014
New Revision: 1577828

URL: http://svn.apache.org/r1577828
Log:
* subversion/svn/svn.c
  (svn_cl__cmd_table): Override the default help text for --force on merge,
    switch and update to document their actual behavior.

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=1577828&r1=1577827&r2=1577828&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Sat Mar 15 10:56:17 2014
@@ -1141,7 +1141,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
 "  repositories.\n"),
     {'r', 'c', 'N', opt_depth, 'q', opt_force, opt_dry_run, opt_merge_cmd,
      opt_record_only, 'x', opt_ignore_ancestry, opt_accept, opt_reintegrate,
-     opt_allow_mixed_revisions, 'v'} },
+     opt_allow_mixed_revisions, 'v'},
+    { { opt_force, N_("force deletions even if the contents doesn't match") } }
+  },
 
   { "mergeinfo", svn_cl__mergeinfo, {0}, N_
     ("Display merge-related information.\n"
@@ -1608,7 +1610,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
     { 'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_relocate,
       opt_ignore_externals, opt_ignore_ancestry, opt_force, opt_accept},
     {{opt_ignore_ancestry,
-      N_("allow switching to a node with no common ancestor")}}
+     N_("allow switching to a node with no common ancestor")},
+     {opt_force,
+      N_("handle unversioned obstructions as changes")}}
   },
 
   { "unlock", svn_cl__unlock, {0}, N_
@@ -1666,7 +1670,9 @@ const svn_opt_subcommand_desc2_t svn_cl_
      "  targets of this operation.\n"),
     {'r', 'N', opt_depth, opt_set_depth, 'q', opt_merge_cmd, opt_force,
      opt_ignore_externals, opt_changelist, opt_editor_cmd, opt_accept,
-     opt_parents} },
+     opt_parents},
+    { {opt_force,
+       N_("handle unversioned obstructions as changes")} } },
 
   { "upgrade", svn_cl__upgrade, {0}, N_
     ("Upgrade the metadata storage format for a working copy.\n"