subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1659185 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Thu, 12 Feb 2015 09:48:06 GMT
Author: rhuijben
Date: Thu Feb 12 09:48:06 2015
New Revision: 1659185

URL: http://svn.apache.org/r1659185
Log:
Resolve regression against 1.8.x in calling 'svn info' on a property
conflicted node that doesn't have a BASE record.

* subversion/libsvn_wc/conflicts.c
  (read_prop_conflict_descs): Read the pristine props instead of the BASE
    props to allow creating a property conflict description for properties
    on a node that was copied.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1659185&r1=1659184&r2=1659185&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Feb 12 09:48:06 2015
@@ -2126,8 +2126,8 @@ read_prop_conflict_descs(apr_array_heade
       return SVN_NO_ERROR;
     }
 
-  SVN_ERR(svn_wc__db_base_get_props(&base_props, db, local_abspath,
-                                    result_pool, scratch_pool));
+  SVN_ERR(svn_wc__db_read_pristine_props(&base_props, db, local_abspath,
+                                         result_pool, scratch_pool));
   iterpool = svn_pool_create(scratch_pool);
   for (hi = apr_hash_first(scratch_pool, conflicted_props);
        hi;



Mime
View raw message