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

[pb...@apache.org]

Author: pburba
Date: Wed Jan 30 20:31:11 2013
New Revision: 1440653

URL: http://svn.apache.org/viewvc?rev=1440653&view=rev
Log:
* subversion/libsvn_client/merge.c
  (process_children_with_new_mergeinfo): Make a note about issue #4309
   in the spot where we'll eventually fix it (but not anytime soon due to
   the blocking issue #4269).


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=1440653&r1=1440652&r2=1440653&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jan 30 20:31:11 2013
@@ -7303,6 +7303,13 @@ process_children_with_new_mergeinfo(merg
 
       svn_pool_clear(iterpool);
 
+      /* Note: We could skip recording inherited mergeinfo here if this path
+         was added (with preexisting mergeinfo) by the merge.  That's actually
+         more correct, since the inherited mergeinfo likely describes
+         non-existent or unrelated merge history, but it's not quite so simple
+         as that, see http://subversion.tigris.org/issues/show_bug.cgi?id=4309
+         */
+
       /* Get the path's new explicit mergeinfo... */
       SVN_ERR(svn_client__get_wc_mergeinfo(&path_explicit_mergeinfo, NULL,
                                            svn_mergeinfo_explicit,