subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1146870 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 14 Jul 2011 19:40:26 GMT
Author: pburba
Date: Thu Jul 14 19:40:25 2011
New Revision: 1146870

URL: http://svn.apache.org/viewvc?rev=1146870&view=rev
Log:
Follow-up to issue #3242 'Subversion demands unnecessary access to parent
directories of operations' fixe in r946767.

This fixes issue #3957 'reintegrate fails with no subtree mergeinfo on
source' on 1.6.x.  Or at least it will, once backported.

* subversion/libsvn_client/merge.c
  (find_unmerged_mergeinfo): Since r946767 the call to svn_ra_get_mergeinfo2
   used a ra_session rooted at the reintegrate *source* not the root of the
   repository.  Since the path keys in the returned catalog are relative to
   the session we need to use relative paths when getting mergeinfo from
   the catalog.

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=1146870&r1=1146869&r2=1146870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jul 14 19:40:25 2011
@@ -10035,7 +10035,8 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
                                         FALSE, FALSE,
                                         iterpool));
           if (subtree_catalog)
-            source_mergeinfo = apr_hash_get(subtree_catalog, source_path,
+            source_mergeinfo = apr_hash_get(subtree_catalog,
+                                            source_path_rel_to_session,
                                             APR_HASH_KEY_STRING);
 
           /* A path might not have any inherited mergeinfo either. */



Mime
View raw message