svn commit: r944980 - /subversion/trunk/subversion/libsvn_wc/props.c

[gs...@apache.org]

Author: gstein
Date: Mon May 17 06:03:44 2010
New Revision: 944980

URL: http://svn.apache.org/viewvc?rev=944980&view=rev
Log:
It is unclear why these changes cause errors, but they do:
  copy_tests 31, 33
  special_tests 7

Back out the changes temporarily for normal operation, but keep them for
USE_DB_PROPS (all tests passed). More investigation is needed, as some
semantic has probably been missed.

* subversion/libsvn_wc/props.c:
  (svn_wc__props_modified): keep some old behavior for now

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

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=944980&r1=944979&r2=944980&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Mon May 17 06:03:44 2010
@@ -2715,8 +2715,13 @@ svn_wc__props_modified(svn_boolean_t *mo
   else if (err)
     return err;
 
+#ifdef USE_DB_PROPS
   SVN_ERR(load_actual_props(&localprops, db, local_abspath,
                             scratch_pool, scratch_pool));
+#else
+  SVN_ERR(load_props(&localprops, db, local_abspath, svn_wc__props_working,
+                     scratch_pool));
+#endif
 
   /* If the WORKING props are not present, then no modifications have
      occurred. */
@@ -2744,6 +2749,7 @@ svn_wc__props_modified(svn_boolean_t *mo
   /* The WORKING props are present, so let's dig in and see what the
      differences are. On really old WCs, they might be the same. On
      newer WCs, the file would have been removed if there was no delta. */
+#ifdef USE_DB_PROPS
   SVN_ERR(load_pristine_props(&baseprops, db, local_abspath,
                               scratch_pool, scratch_pool));
   if (baseprops == NULL)
@@ -2753,6 +2759,10 @@ svn_wc__props_modified(svn_boolean_t *mo
       *modified_p = apr_hash_count(localprops) > 0;
       return SVN_NO_ERROR;
     }
+#else
+  SVN_ERR(load_props(&baseprops, db, local_abspath, svn_wc__props_base,
+                     scratch_pool));
+#endif
 
   SVN_ERR(svn_prop_diffs(&local_propchanges, localprops, baseprops,
                          scratch_pool));