You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/07/24 17:32:42 UTC
svn commit: r1692541 -
/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
Author: stefan2
Date: Fri Jul 24 15:32:42 2015
New Revision: 1692541
URL: http://svn.apache.org/r1692541
Log:
On the svn-mergeinfo-normalizer branch:
* tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
(svn_min__cmd_table): Extend the docstring for the 'normalize' sub-command
to cover the new elision messages.
Modified:
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/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=1692541&r1=1692540&r2=1692541&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 Fri Jul 24 15:32:42 2015
@@ -264,9 +264,15 @@ const svn_opt_subcommand_desc2_t svn_min
" Mergeinfo for this branch can be elided.\n"
" elide branch - Not an exact match with the parent but the\n"
" differences could be eliminated by ...\n"
+ " revisions implied in parent\n"
+ " ... ignoring these revisions because they are\n"
+ " part of the parent's copy history.\n"
" revisions moved to parent\n"
" ... adding these revisions to the parent node\n"
" because they only affect the current sub-tree.\n"
+ " revisions implied in sub-tree\n"
+ " ... ignoring these revisions because they are\n"
+ " part of the sub-tree's copy history.\n"
" revisions inoperative in sub-node\n"
" ... removing these revisions from the sub-tree\n"
" mergeinfo because they did not change it.\n"