Author: pburba
Date: Fri Nov 18 18:36:01 2011
New Revision: 1203786
URL: http://svn.apache.org/viewvc?rev=1203786&view=rev
Log:
Replace a chunk of code with call to an existing function which already does
the same thing.
* subversion/libsvn_client/merge.c
(record_mergeinfo_for_dir_merge): subtree_touched_by_merge does what we
need to determine if a merge was operative.
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=1203786&r1=1203785&r2=1203786&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Nov 18 18:36:01 2011
@@ -7399,15 +7399,8 @@ record_mergeinfo_for_dir_merge(svn_merge
/* Regardless of what subtrees in MERGE_B->TARGET_ABSPATH might be missing
could this merge have been operative? */
- if ((notify_b->merged_abspaths
- && apr_hash_count(notify_b->merged_abspaths))
- || (notify_b->skipped_abspaths
- && apr_hash_count(notify_b->skipped_abspaths))
- || (notify_b->added_abspaths
- && apr_hash_count(notify_b->added_abspaths))
- || (notify_b->tree_conflicted_abspaths
- && apr_hash_count(notify_b->tree_conflicted_abspaths)))
- operative_merge = TRUE;
+ operative_merge = subtree_touched_by_merge(merge_b->target_abspath,
+ notify_b, iterpool);
/* If this couldn't be an operative merge then don't bother with
the added complexity (and user confusion) of non-inheritable ranges.
