You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/03/05 00:03:30 UTC
svn commit: r1452583 - in /subversion/trunk/subversion/libsvn_client:
mergeinfo.c mergeinfo.h
Author: julianfoad
Date: Mon Mar 4 23:03:30 2013
New Revision: 1452583
URL: http://svn.apache.org/r1452583
Log:
* subversion/libsvn_client/mergeinfo.h,
subversion/libsvn_client/mergeinfo.c
(svn_client__record_wc_mergeinfo_catalog): Add more documentation.
Modified:
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_client/mergeinfo.h
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1452583&r1=1452582&r2=1452583&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Mon Mar 4 23:03:30 2013
@@ -161,6 +161,9 @@ svn_client__record_wc_mergeinfo_catalog(
apr_array_header_t *sorted_cat =
svn_sort__hash(result_catalog, svn_sort_compare_items_as_paths,
scratch_pool);
+
+ /* Write the mergeinfo out in sorted order of the paths, so that
+ * notifications are in a predictable and convenient order. */
for (i = 0; i < sorted_cat->nelts; i++)
{
svn_sort__item_t elt = APR_ARRAY_IDX(sorted_cat, i,
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.h?rev=1452583&r1=1452582&r2=1452583&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.h (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.h Mon Mar 4 23:03:30 2013
@@ -339,7 +339,12 @@ svn_client__record_wc_mergeinfo(const ch
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool);
-/* Write mergeinfo into the WC. RESULT_CATALOG maps (const char *) WC paths
+/* Write mergeinfo into the WC.
+ *
+ * For each path in RESULT_CATALOG, set the SVN_PROP_MERGEINFO
+ * property to represent the given mergeinfo, or remove the property
+ * if the given mergeinfo is null, and notify the change. Leave
+ * other paths unchanged. RESULT_CATALOG maps (const char *) WC paths
* to (svn_mergeinfo_t) mergeinfo. */
svn_error_t *
svn_client__record_wc_mergeinfo_catalog(apr_hash_t *result_catalog,