You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by pb...@apache.org on 2010/08/27 18:32:55 UTC

svn commit: r990202 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: pburba
Date: Fri Aug 27 16:32:55 2010
New Revision: 990202

URL: http://svn.apache.org/viewvc?rev=990202&view=rev
Log:
A tiny optimization to the issue #3642 fix.

* subversion/libsvn_client/merge.c

  (record_mergeinfo_for_dir_merge): Don't make a needless function call if
   we know it will be inoperative.

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=990202&r1=990201&r2=990202&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Aug 27 16:32:55 2010
@@ -7210,7 +7210,8 @@ record_mergeinfo_for_dir_merge(svn_merge
      merge target, with no pre-existing explicit mergeinfo, during a --depth
      immediates merge).  Stash those that are inoperative at any depth in
      INOPERATIVE_IMMEDIATE_CHILDREN. */
-  if (!merge_b->record_only && range.start <= range.end)
+  if (!merge_b->record_only && range.start <= range.end
+      && depth == svn_depth_immediates)
     SVN_ERR(get_inoperative_immediate_children(
       &inoperative_immediate_children,
       notify_b->children_with_mergeinfo,