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 2012/03/29 16:27:06 UTC
svn commit: r1306880 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: julianfoad
Date: Thu Mar 29 14:27:06 2012
New Revision: 1306880
URL: http://svn.apache.org/viewvc?rev=1306880&view=rev
Log:
* subversion/libsvn_client/merge.c:
(calculate_left_hand_side, find_reintegrate_merge, find_base_on_target):
Correct the type of some 'mergeinfo catalog' parameters and variables.
This is inconsequential because both the wrong and correct types are
aliases for the same basic type.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1306880&r1=1306879&r2=1306880&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Mar 29 14:27:06 2012
@@ -10364,8 +10364,8 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
allocations. */
static svn_error_t *
calculate_left_hand_side(repo_location_t **left_p,
- svn_mergeinfo_t *merged_to_source_catalog,
- svn_mergeinfo_t *unmerged_to_source_catalog,
+ svn_mergeinfo_catalog_t *merged_to_source_catalog,
+ svn_mergeinfo_catalog_t *unmerged_to_source_catalog,
const merge_target_t *target,
apr_hash_t *subtrees_with_mergeinfo,
const repo_location_t *source_loc,
@@ -10544,8 +10544,8 @@ find_reintegrate_merge(merge_source_t **
repo_location_t *yc_ancestor;
repo_location_t *loc1;
merge_source_t source;
- svn_mergeinfo_t unmerged_to_source_mergeinfo_catalog;
- svn_mergeinfo_t merged_to_source_mergeinfo_catalog;
+ svn_mergeinfo_catalog_t unmerged_to_source_mergeinfo_catalog;
+ svn_mergeinfo_catalog_t merged_to_source_mergeinfo_catalog;
svn_error_t *err;
apr_hash_t *subtrees_with_mergeinfo;
@@ -11125,8 +11125,8 @@ find_base_on_target(repo_location_t **ba
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_mergeinfo_t unmerged_to_source_mergeinfo_catalog;
- svn_mergeinfo_t merged_to_source_mergeinfo_catalog;
+ svn_mergeinfo_catalog_t unmerged_to_source_mergeinfo_catalog;
+ svn_mergeinfo_catalog_t merged_to_source_mergeinfo_catalog;
apr_hash_t *subtrees_with_mergeinfo;
/* Find all the subtrees in TARGET_WCPATH that have explicit mergeinfo. */