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/08/13 18:09:32 UTC

svn commit: r1695731 - /subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c

Author: stefan2
Date: Thu Aug 13 16:09:32 2015
New Revision: 1695731

URL: http://svn.apache.org/r1695731
Log:
On the svn-mergeinfo-normalizer branch:

* tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
  (svn_min__cmd_table): Document the two new "missing branch" states.

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=1695731&r1=1695730&r2=1695731&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 Thu Aug 13 16:09:32 2015
@@ -287,6 +287,12 @@ const svn_opt_subcommand_desc2_t svn_min
      "      revisions missing in sub-node\n"
      "                             ... these revisions affect current sub-tree\n"
      "                             but are only listed as merged for the parent.\n"
+     "    keep POTENTIAL branch  - The path does not exist @HEAD but may appear\n"
+     "                             in the future as the result of catch-up merges\n"
+     "                             from other branches.\n"
+     "    has SURVIVING COPIES:  - The path does not exist @HEAD but copies of it\n"
+     "                             or its sub-nodes do.  This mergeinfo may be\n"
+     "                             relevant to them and will be kept.\n"
      "    NON-RECURSIVE RANGE(S) found\n"
      "                           - Those revisions had been merged into a sparse\n"
      "                             working copy resulting in incomplete merges.\n"