subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1438778 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Fri, 25 Jan 2013 23:54:40 GMT
Author: rhuijben
Date: Fri Jan 25 23:54:39 2013
New Revision: 1438778

URL: http://svn.apache.org/viewvc?rev=1438778&view=rev
Log:
* subversion/libsvn_client/merge.c
  (merge_dir_props_changed): Add note about merge_tests.py failure.

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=1438778&r1=1438777&r2=1438778&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Jan 25 23:54:39 2013
@@ -1514,6 +1514,18 @@ merge_dir_props_changed(svn_wc_notify_st
          ### merges, but in this case the fix added here should also be applied
          ### for added files! */
 
+      /* ### The old code performed (via prepare_merge_props_changed):
+      if (apr_hash_get(new_pristine_props, SVN_PROP_MERGEINFO,
+                       APR_HASH_KEY_STRING))
+        {
+          alloc_and_store_path(&merge_b->paths_with_new_mergeinfo,
+                               local_abspath, merge_b->pool);
+        }
+         ### which is something merge_add_file() doesn't do, but
+         ### merge_tests.py 95: no self referential filtering on added path
+         ### fails if this block is not enabled.
+      */
+
       return SVN_NO_ERROR;
     }
 



Mime
View raw message