You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2017/07/26 14:14:36 UTC
svn commit: r1803053 - /subversion/trunk/subversion/svn/svn.c
Author: danielsh
Date: Wed Jul 26 14:14:36 2017
New Revision: 1803053
URL: http://svn.apache.org/viewvc?rev=1803053&view=rev
Log:
* subversion/svn/svn.c
(svn_cl__cmd_table."cleanup"): Edit the help text so it is clear that
breaking locks does not apply to the newer modes of operation.
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=1803053&r1=1803052&r2=1803053&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Wed Jul 26 14:14:36 2017
@@ -609,35 +609,32 @@ const svn_opt_subcommand_desc2_t svn_cl_
{'r', 'q', 'N', opt_depth, opt_force, opt_ignore_externals} },
{ "cleanup", svn_cl__cleanup, {0}, N_
- ("Recursively clean up the working copy, removing write locks, resuming\n"
- "unfinished operations, removing unversioned or ignored items, etc.\n"
+ ("Either recover from an interrupted operation that left the working copy locked,\n"
+ "or remove unwanted files.\n"
"usage: 1. cleanup [WCPATH...]\n"
- "usage: 2. cleanup OPTIONS [WCPATH...]\n"
+ " 2. cleanup --remove-unversioned [WCPATH...]\n"
+ " cleanup --remove-ignored [WCPATH...]\n"
+ " 3. cleanup --vacuum-pristines [WCPATH...]\n"
"\n"
- " By default, finish any unfinished business in the working copy at WCPATH,\n"
- " and remove write locks (shown as 'L' by the 'svn status' command) from\n"
- " the working copy. Usually, this is only necessary if a Subversion client\n"
- " has crashed while using the working copy, leaving it in an unusable state.\n"
+ " 1. When none of the options --remove-unversioned, --remove-ignored, and\n"
+ " --vacuum-pristines is specified, remove all write locks (shown as 'L' by\n"
+ " the 'svn status' command) from the working copy. Usually, this is only\n"
+ " necessary if a Subversion client has crashed while using the working copy,\n"
+ " leaving it in an unusable state.\n"
"\n"
- " WARNING: There is no mechanism that will protect write locks still\n"
- " being used by other Subversion clients. Running this command\n"
- " without any options while another client is using the working\n"
- " copy can corrupt the working copy beyond repair!\n"
+ " WARNING: There is no mechanism that will protect write locks still\n"
+ " being used by other Subversion clients. Running this command\n"
+ " without any options while another client is using the working\n"
+ " copy can corrupt the working copy beyond repair!\n"
"\n"
- " If the --remove-unversioned option or the --remove-ignored option\n"
- " is given, remove any unversioned or ignored items within WCPATH.\n"
- " To prevent accidental working copy corruption, unversioned or ignored\n"
- " items can only be removed if the working copy is not already locked\n"
- " for writing by another Subversion client.\n"
- " Note that the 'svn status' command shows unversioned items as '?',\n"
- " and ignored items as 'I' if the --no-ignore option is given to it.\n"
+ " 2. If the --remove-unversioned option or the --remove-ignored option\n"
+ " is given, remove any unversioned or ignored items within WCPATH.\n"
+ " Note that the 'svn status' command shows unversioned items as '?',\n"
+ " and ignored items as 'I' if the --no-ignore option is given to it.\n"
"\n"
- " The --vacuum-pristines option provides a safe way to remove pristine\n"
- " copies of files which are stored inside the .svn directory and which\n"
- " are no longer referenced by any file in the working copy.\n"
- " To prevent accidental working copy corruption, this operation will\n"
- " only succeed if the working copy is not already locked for writing by\n"
- " another Subversion client.\n"),
+ " 3. If the --vacuum-pristines option is given, remove pristine copies of\n"
+ " files which are stored inside the .svn directory and which are no longer\n"
+ " referenced by any file in the working copy.\n"),
{ opt_remove_unversioned, opt_remove_ignored, opt_vacuum_pristines,
opt_include_externals, 'q', opt_merge_cmd },
{ { opt_merge_cmd, N_("deprecated and ignored") } } },
Re: svn commit: r1803053 - /subversion/trunk/subversion/svn/svn.c
Posted by Stefan Sperling <st...@elego.de>.
On Wed, Jul 26, 2017 at 02:14:36PM -0000, danielsh@apache.org wrote:
> Author: danielsh
> Date: Wed Jul 26 14:14:36 2017
> New Revision: 1803053
>
> URL: http://svn.apache.org/viewvc?rev=1803053&view=rev
> Log:
> * subversion/svn/svn.c
> (svn_cl__cmd_table."cleanup"): Edit the help text so it is clear that
> breaking locks does not apply to the newer modes of operation.
>
> 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=1803053&r1=1803052&r2=1803053&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/svn/svn.c (original)
> +++ subversion/trunk/subversion/svn/svn.c Wed Jul 26 14:14:36 2017
> @@ -609,35 +609,32 @@ const svn_opt_subcommand_desc2_t svn_cl_
> {'r', 'q', 'N', opt_depth, opt_force, opt_ignore_externals} },
>
> { "cleanup", svn_cl__cleanup, {0}, N_
> - ("Recursively clean up the working copy, removing write locks, resuming\n"
> - "unfinished operations, removing unversioned or ignored items, etc.\n"
> + ("Either recover from an interrupted operation that left the working copy locked,\n"
> + "or remove unwanted files.\n"
> "usage: 1. cleanup [WCPATH...]\n"
> - "usage: 2. cleanup OPTIONS [WCPATH...]\n"
> + " 2. cleanup --remove-unversioned [WCPATH...]\n"
> + " cleanup --remove-ignored [WCPATH...]\n"
> + " 3. cleanup --vacuum-pristines [WCPATH...]\n"
Thanks, that is indeed clearer.
Technically, both --remove-* options and --vacuum-pristines can be combined.
But I don't think we need to be that precise in the help text, so I don't
see a reason to adjust your change.