svn commit: r941651 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

[ju...@apache.org]

Author: julianfoad
Date: Thu May  6 10:49:46 2010
New Revision: 941651

URL: http://svn.apache.org/viewvc?rev=941651&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
  (svn_wc_add_repos_file4): A small code simplification.

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

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=941651&r1=941650&r2=941651&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu May  6 10:49:46 2010
@@ -5768,7 +5768,6 @@ svn_wc_add_repos_file4(svn_wc_context_t 
   const char *tmp_text_base_abspath;
   svn_checksum_t *base_checksum;
   struct last_change_info *last_change = NULL;
-  svn_error_t *err;
   const char *source_abspath = NULL;
 
   SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -5804,6 +5803,7 @@ svn_wc_add_repos_file4(svn_wc_context_t 
 
      ### This block can be removed once the new pristine store is in place */
   {
+    svn_error_t *err;
     svn_wc__db_status_t status;
 
     err = svn_wc__db_base_get_info(&status, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -5896,17 +5896,13 @@ svn_wc_add_repos_file4(svn_wc_context_t 
                                        pool));
   }
 
-  /* Categorize the base properties. */
+  /* Update LAST_CHANGE to reflect the entry props in NEW_BASE_PROPS, and
+     filter NEW_BASE_PROPS so it contains only regular props. */
   {
     apr_array_header_t *regular_props;
     apr_array_header_t *entry_props;
-    apr_array_header_t *prop_array;
 
-    /* Diff an empty prop has against the new base props gives us an array
-       of all props. */
-    SVN_ERR(svn_prop_diffs(&prop_array, new_base_props,
-                           apr_hash_make(pool), pool));
-    SVN_ERR(svn_categorize_props(prop_array,
+    SVN_ERR(svn_categorize_props(svn_prop_hash_to_array(new_base_props, pool),
                                  &entry_props, NULL, &regular_props,
                                  pool));