Author: stefan2
Date: Sat Aug 15 16:52:09 2015
New Revision: 1696068
URL: http://svn.apache.org/r1696068
Log:
Make standard svn-mergeinfo-normalizer analysis output (i.e. without -v)
a bit more verbose. If elision is non-trivial, always show what will be
changed to align parent and sub-tree mergeinfo.
While this somewhat blurs the "cannot elide" messages, this sort of output
is what you might want to add to a log message etc. to document why a
non-trivial mergeinfo elision has been possible.
* tools/client-side/svn-mergeinfo-normalizer/logic.c
(show_branch_elision): Add conditions under which to print output.
Modified:
subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c
Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1696068&r1=1696067&r2=1696068&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c
(original)
+++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/logic.c Sat Aug
15 16:52:09 2015
@@ -214,7 +214,11 @@ show_branch_elision(const char *branch,
scratch_pool));
}
}
- else if (opt_state->verbose)
+ else if ( opt_state->verbose
+ || opt_state->run_analysis && ( implied_in_parent->nelts
+ || subtree_only->nelts
+ || implied_in_subtree->nelts
+ || parent_only->nelts))
{
SVN_ERR(svn_rangelist_remove(&subtree_only, implied_in_parent,
subtree_only, TRUE, scratch_pool));
