diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
| commit | 3faf8d6bffc5d0fb2525ba37bb504c53366caf9d (patch) | |
| tree | 7e47911263e75034b767fe34b2f8d3d17e91f66d /subversion/libsvn_client/mergeinfo.c | |
| parent | a55fb3c0d5eca7d887798125d5b95942b1f01d4b (diff) | |
Diffstat (limited to 'subversion/libsvn_client/mergeinfo.c')
| -rw-r--r-- | subversion/libsvn_client/mergeinfo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/subversion/libsvn_client/mergeinfo.c b/subversion/libsvn_client/mergeinfo.c index 622dbbca2261..f4f5acd6c850 100644 --- a/subversion/libsvn_client/mergeinfo.c +++ b/subversion/libsvn_client/mergeinfo.c @@ -1946,12 +1946,12 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged, SVN_ERR(svn_mergeinfo__add_suffix_to_mergeinfo( &subtree_source_history, source_history, - subtree_rel_path, scratch_pool, scratch_pool)); + subtree_rel_path, scratch_pool, iterpool)); if (!finding_merged) SVN_ERR(svn_mergeinfo__add_suffix_to_mergeinfo( &subtree_history, target_history, - subtree_rel_path, scratch_pool, scratch_pool)); + subtree_rel_path, scratch_pool, iterpool)); } else { @@ -1969,7 +1969,7 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged, scratch_pool, iterpool)); SVN_ERR(svn_mergeinfo_merge2(subtree_mergeinfo, merged_via_history, - scratch_pool, scratch_pool)); + scratch_pool, iterpool)); } SVN_ERR(svn_mergeinfo_inheritable2(&subtree_inheritable_mergeinfo, @@ -1995,7 +1995,7 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged, subtree_source_history, FALSE, scratch_pool, iterpool)); svn_mergeinfo__set_inheritance(merged_noninheritable, FALSE, - scratch_pool); + iterpool); /* Keep track of all ranges partially merged to any and all subtrees. */ |