You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/03 16:21:54 UTC

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

Author: rhuijben
Date: Sun Apr  3 14:21:54 2011
New Revision: 1088312

URL: http://svn.apache.org/viewvc?rev=1088312&view=rev
Log:
Remove another database transaction for every file on checkout: Don't set
the actual node properties when the result is ignored by the database layer,
because they are equal to the pristine properties.

* subversion/libsvn_wc/update_editor.c
  (close_file): Don't set actual properties on a newly added file as they
    already receive the pristine properties.

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=1088312&r1=1088311&r2=1088312&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sun Apr  3 14:21:54 2011
@@ -4333,9 +4333,11 @@ close_file(void *file_baton,
                                                 pool));
     }
 
-  /* Now we need to update the ACTUAL tree, with the result of the
+  /* Now we might have to update the ACTUAL tree, with the result of the
      properties merge. */
-  if (! fb->adding_base_under_local_add && !fb->deleted)
+  if (! (fb->adding_file && !fb->add_existed)
+      && ! fb->adding_base_under_local_add 
+      && ! fb->deleted)
     {
       SVN_ERR_ASSERT(new_actual_props != NULL);