subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1185693 - /subversion/trunk/subversion/include/svn_mergeinfo.h
Date Tue, 18 Oct 2011 14:42:04 GMT
Author: pburba
Date: Tue Oct 18 14:42:03 2011
New Revision: 1185693

URL: http://svn.apache.org/viewvc?rev=1185693&view=rev
Log:
* subversion/include/svn_mergeinfo.h
  (svn_mergeinfo_merge2): Clarify how the result pool is used.

Modified:
    subversion/trunk/subversion/include/svn_mergeinfo.h

Modified: subversion/trunk/subversion/include/svn_mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_mergeinfo.h?rev=1185693&r1=1185692&r2=1185693&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_mergeinfo.h (original)
+++ subversion/trunk/subversion/include/svn_mergeinfo.h Tue Oct 18 14:42:03 2011
@@ -209,8 +209,9 @@ svn_mergeinfo_diff(svn_mergeinfo_t *dele
 /** Merge a shallow copy of one mergeinfo, @a changes, into another mergeinfo
  * @a mergeinfo.
  *
- * Additions to @a mergeinfo are allocated in @a result_pool.  Temporary
- * allocations are made in @a scratch_pool.
+ * Rangelists for merge source paths common to @a changes and @a mergeinfo may
+ * result in new rangelists; these are allocated in @a result_pool.
+ * Temporary allocations are made in @a scratch_pool.
  *
  * When intersecting rangelists for a path are merged, the inheritability of
  * the resulting svn_merge_range_t depends on the inheritability of the



Mime
View raw message