Author: stefan2
Date: Tue Jun 30 18:06:07 2015
New Revision: 1688496
URL: http://svn.apache.org/r1688496
Log:
On the svn-mergeinfo-normalizer:
Remove redundant sub-commands. "normalize" now handles all possible variants.
* tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
(svn_min__clear_obsolete,
svn_min__combine_ranges): Remove sub-command declarations.
* tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
(svn_min__cmd_table): Remove redundant sub-commands.
* tools/client-side/svn-mergeinfo-normalizer/clear-obsolete-cmd.c
* tools/client-side/svn-mergeinfo-normalizer/combine-ranges-cmd.c:
Remove these command implementation files.
Removed:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/clear-obsolete-cmd.c
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/combine-ranges-cmd.c
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h?rev=1688496&r1=1688495&r2=1688496&view=diff
==============================================================================
---
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
(original)
+++
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/mergeinfo-normalizer.h
Tue Jun 30 18:06:07 2015
@@ -92,8 +92,6 @@ typedef struct svn_min__cmd_baton_t
svn_opt_subcommand_t
svn_min__help,
svn_min__normalize,
- svn_min__clear_obsolete,
- svn_min__combine_ranges,
svn_min__analyze;
/* See definition in svn.c for documentation. */
Modified:
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c?rev=1688496&r1=1688495&r2=1688496&view=diff
==============================================================================
---
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
(original)
+++
subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
Tue Jun 30 18:06:07 2015
@@ -230,16 +230,6 @@ const svn_opt_subcommand_desc2_t svn_min
{opt_targets, opt_depth, opt_dry_run, 'q',
opt_remove_obsoletes, opt_remove_redundant, opt_combine_ranges} },
- { "clear-obsoletes", svn_min__clear_obsolete, { 0 }, N_
- ("Remove mergeinfo that refers to branches that no longer exist.\n"
- "usage: clear-obsoletes [WCPATH...]\n"),
- {opt_targets, opt_depth, opt_dry_run, 'q'} },
-
- { "combine-ranges", svn_min__combine_ranges, { 0 }, N_
- ("Combine revision ranges if all revisions in between are inoperative.\n"
- "usage: remove-ranges [WCPATH...]\n"),
- {opt_targets, opt_depth, opt_dry_run, 'q'} },
-
{ "analyze", svn_min__analyze, { "analyse" }, N_
("Generate a report of which part of the sub-tree mergeinfo\n"
"can be removed and which part can't.\n"
