Author: pburba
Date: Fri Nov 18 17:37:29 2011
New Revision: 1203760
URL: http://svn.apache.org/viewvc?rev=1203760&view=rev
Log:
* subversion/libsvn_client/merge.c
(get_mergeinfo_paths): Don't retrieve subtrees that are below the
operational depth of the merge.
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=1203760&r1=1203759&r2=1203760&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Nov 18 17:37:29 2011
@@ -5977,7 +5977,11 @@ get_mergeinfo_paths(apr_array_header_t *
so it has explicit mergeinfo that reflects only CHILD's
inheritable mergeinfo. */
- if (child->has_noninheritable)
+ /* If depth is immediates or files then don't add new children if
+ CHILD is a subtree of the merge target; those children are below
+ the operational depth of the merge. */
+ if (child->has_noninheritable
+ && (i == 0 || depth == svn_depth_infinity))
{
const apr_array_header_t *children;
int j;
