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

[rh...@apache.org]

Author: rhuijben
Date: Tue May  3 18:07:29 2011
New Revision: 1099162

URL: http://svn.apache.org/viewvc?rev=1099162&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
  (includes): Remove svn_iter.h and tree_conflicts.h
  (close_directory): Use the current set of properties instead of reading
    them again for determining the old externals value.

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=1099162&r1=1099161&r2=1099162&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue May  3 18:07:29 2011
@@ -42,13 +42,11 @@
 #include "svn_io.h"
 #include "svn_private_config.h"
 #include "svn_time.h"
-#include "svn_iter.h"
 
 #include "wc.h"
 #include "adm_files.h"
 #include "entries.h"
 #include "translate.h"
-#include "tree_conflicts.h"
 #include "workqueue.h"
 
 #include "private/svn_wc_private.h"
@@ -2377,9 +2375,8 @@ close_directory(void *dir_baton,
                   const svn_string_t *new_val_s = change->value;
                   const svn_string_t *old_val_s;
 
-                  SVN_ERR(svn_wc__internal_propget(
-                           &old_val_s, eb->db, db->local_abspath,
-                           SVN_PROP_EXTERNALS, db->pool, db->pool));
+                  old_val_s = apr_hash_get(base_props, SVN_PROP_EXTERNALS,
+                                           APR_HASH_KEY_STRING);
 
                   if ((new_val_s == NULL) && (old_val_s == NULL))
                     ; /* No value before, no value after... so do nothing. */