Author: gstein
Date: Thu Jul 21 02:27:39 2011
New Revision: 1149010
URL: http://svn.apache.org/viewvc?rev=1149010&view=rev
Log:
Followup to r1149001: fix crasher.
* subversion/libsvn_client/merge.c:
(remove_noop_subtree_ranges): the output of the svn_rangelist_merge()
call needs to be placed into the baton, not the localvar.
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=1149010&r1=1149009&r2=1149010&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jul 21 02:27:39 2011
@@ -8149,7 +8149,7 @@ remove_noop_subtree_ranges(const char *u
operative_ranges,
inoperative_ranges, FALSE, scratch_pool));
- SVN_ERR(svn_rangelist_merge(&merged_ranges,
+ SVN_ERR(svn_rangelist_merge(&log_gap_baton.merged_ranges,
inoperative_ranges, scratch_pool));
for (i = 1; i < notify_b->children_with_mergeinfo->nelts; i++)
