Author: pburba
Date: Thu Jul 21 01:11:27 2011
New Revision: 1149001
URL: http://svn.apache.org/viewvc?rev=1149001&view=rev
Log:
* subversion/libsvn_client/merge.c
(remove_noop_subtree_ranges): Use local variables rather than baton
struct members. No functional change, just a bit of clarity.
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=1149001&r1=1149000&r2=1149001&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jul 21 01:11:27 2011
@@ -8146,10 +8146,10 @@ remove_noop_subtree_ranges(const char *u
youngest_gap_rev->end,
TRUE, scratch_pool);
SVN_ERR(svn_rangelist_remove(&(inoperative_ranges),
- log_gap_baton.operative_ranges,
+ operative_ranges,
inoperative_ranges, FALSE, scratch_pool));
- SVN_ERR(svn_rangelist_merge(&(log_gap_baton.merged_ranges),
+ SVN_ERR(svn_rangelist_merge(&merged_ranges,
inoperative_ranges, scratch_pool));
for (i = 1; i < notify_b->children_with_mergeinfo->nelts; i++)
@@ -8164,7 +8164,7 @@ remove_noop_subtree_ranges(const char *u
/* Remove inoperative ranges from all children so we don't perform
inoperative editor drives. */
SVN_ERR(svn_rangelist_remove(&(child->remaining_ranges),
- log_gap_baton.merged_ranges,
+ merged_ranges,
child->remaining_ranges,
FALSE, result_pool));
}
