svn commit: r979247 - in /subversion/trunk/subversion/libsvn_wc: update_editor.c wc_db.c

[ph...@apache.org]

Author: philip
Date: Mon Jul 26 11:32:28 2010
New Revision: 979247

URL: http://svn.apache.org/viewvc?rev=979247&view=rev
Log:
Make depth_tests.py PASS with single-db.

* subversion/libsvn_wc/update_editor.c
  (add_directory): Set the depth after adding the entry.

* subversion/libsvn_wc/wc_db.c
  (update_depth_values): Make per-db depth tweaking conditional.

Modified:
    subversion/trunk/subversion/libsvn_wc/update_editor.c
    subversion/trunk/subversion/libsvn_wc/wc_db.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=979247&r1=979246&r2=979247&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Jul 26 11:32:28 2010
@@ -2710,6 +2710,10 @@ add_directory(const char *path,
                                                        *eb->target_revision,
                                                        pool));
 
+  SVN_ERR(svn_wc__db_temp_op_set_dir_depth(eb->db,
+                                           db->local_abspath,
+                                           db->ambient_depth,
+                                           pool));
 #else
     {
       /* Immediately create an entry for the new directory in the parent.

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=979247&r1=979246&r2=979247&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jul 26 11:32:28 2010
@@ -4339,9 +4339,11 @@ update_depth_values(svn_wc__db_pdh_t *pd
   /* Flush any entries before we start monkeying the database.  */
   flush_entries(pdh);
 
+#ifndef SVN_WC__SINGLE_DB
   /* Parent stubs have only two depth options: excluded, or infinity.  */
   if (*local_relpath != '\0' && !excluded)
     depth = svn_depth_infinity;
+#endif
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
                                     excluded