subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1781659 - in /subversion/trunk/subversion/include: svn_fs.h svn_repos.h
Date Sat, 04 Feb 2017 12:02:25 GMT
Author: stefan2
Date: Sat Feb  4 12:02:25 2017
New Revision: 1781659

URL: http://svn.apache.org/viewvc?rev=1781659&view=rev
Log:
Follow-up to r1780810 and r1780820:
Docstring fixes. No functional change.

Found by: julianfoad

* subversion/include/svn_fs.h
  (svn_fs_get_mergeinfo3): Remove all references to the removed CATALOG
                           parameter.

* subversion/include/svn_repos.h
  (svn_repos_fs_get_mergeinfo2): Same.

Modified:
    subversion/trunk/subversion/include/svn_fs.h
    subversion/trunk/subversion/include/svn_repos.h

Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1781659&r1=1781658&r2=1781659&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Sat Feb  4 12:02:25 2017
@@ -2188,7 +2188,7 @@ typedef svn_error_t *
  * explicit-or-inherited, or only inherited mergeinfo.
  *
  * If @a adjust_inherited_mergeinfo is @c TRUE, then any inherited
- * mergeinfo returned in @a *catalog is normalized to represent the
+ * mergeinfo reported to @a *receiver is normalized to represent the
  * inherited mergeinfo on the path which inherits it.  This adjusted
  * mergeinfo is keyed by the path which inherits it.  If
  * @a adjust_inherited_mergeinfo is @c FALSE, then any inherited
@@ -2203,10 +2203,9 @@ typedef svn_error_t *
  * the #SVN_PROP_MERGEINFO property explicitly set on it.  (Note
  * that inheritance is only taken into account for the elements in @a
  * paths; descendants of the elements in @a paths which get their
- * mergeinfo via inheritance are not included in @a *catalog.)
+ * mergeinfo via inheritance are not reported to @a receiver.)
  *
- * Allocate @a *catalog in result_pool.  Do any necessary temporary
- * allocations in @a scratch_pool.
+ * Do any necessary temporary allocations in @a scratch_pool.
  *
  * @since New in 1.10.
  */

Modified: subversion/trunk/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1781659&r1=1781658&r2=1781659&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Sat Feb  4 12:02:25 2017
@@ -2240,7 +2240,7 @@ typedef svn_fs_mergeinfo_receiver_t svn_
  * For each node found with mergeinfo on it, invoke @a receiver with
  * the provided @a receiver_baton.
  *
- * The paths in @a paths, and the keys of @a catalog, start with '/'.
+ * The paths in @a paths start with '/'.
  *
  * @a inherit indicates whether explicit, explicit or inherited, or
  * only inherited mergeinfo for @a paths is fetched.
@@ -2252,7 +2252,7 @@ typedef svn_fs_mergeinfo_receiver_t svn_
  * the #SVN_PROP_MERGEINFO property explicitly set on it.  (Note
  * that inheritance is only taken into account for the elements in @a
  * paths; descendants of the elements in @a paths which get their
- * mergeinfo via inheritance are not included in @a *catalog.)
+ * mergeinfo via inheritance are not reported to @a receiver.)
  *
  * If optional @a authz_read_func is non-NULL, then use this function
  * (along with optional @a authz_read_baton) to check the readability



Mime
View raw message