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

Posted to commits@subversion.apache.org by ju...@apache.org on 2012/03/25 16:46:43 UTC

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

Author: julianfoad
Date: Sun Mar 25 14:46:42 2012
New Revision: 1305054

URL: http://svn.apache.org/viewvc?rev=1305054&view=rev
Log:
* subversion/libsvn_client/merge.c
  (do_file_merge): Note what looks like a bug.

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=1305054&r1=1305053&r2=1305054&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Sun Mar 25 14:46:42 2012
@@ -6798,6 +6798,9 @@ do_file_merge(svn_mergeinfo_catalog_t re
          by SOURCE->rev1:rev2. */
       if (!merge_b->record_only)
         {
+          /* ### Bug?  calculate_remaining_ranges() needs 'source' to adhere
+           *   to the requirements of 'MERGEINFO MERGE SOURCE NORMALIZATION'
+           *   here, but it doesn't appear to be guaranteed so. */
           SVN_ERR(calculate_remaining_ranges(NULL, merge_target,
                                              source,
                                              target_mergeinfo,