svn commit: r953975 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[rh...@apache.org]

Author: rhuijben
Date: Sat Jun 12 09:45:16 2010
New Revision: 953975

URL: http://svn.apache.org/viewvc?rev=953975&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_temp_set_parent_stub_to_normal): Following up on r953936, fix
    uses of basename after removing a variable and following up on r953765,
    remove some SVN_DBG() calls.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=953975&r1=953974&r2=953975&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Sat Jun 12 09:45:16 2010
@@ -8331,19 +8331,17 @@ svn_wc__db_temp_set_parent_stub_to_norma
 
   if (delete_working)
     {
-      SVN_DBG(("Deleting working\n"));
       SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
                                        STMT_DELETE_WORKING_NODE));
-      SVN_ERR(svn_sqlite__bindf(stmt, "is", pdh->wcroot->wc_id, basename));
+      SVN_ERR(svn_sqlite__bindf(stmt, "is", pdh->wcroot->wc_id, base));
 
       SVN_ERR(svn_sqlite__step_done(stmt));
     }
 
-  SVN_DBG(("Updating presence for %s\n", svn_dirent_local_style(local_abspath, scratch_pool)));
   SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
                                     STMT_UPDATE_BASE_PRESENCE_KIND));
 
-  SVN_ERR(svn_sqlite__bindf(stmt, "istt", pdh->wcroot->wc_id, basename,
+  SVN_ERR(svn_sqlite__bindf(stmt, "istt", pdh->wcroot->wc_id, base,
                             presence_map, svn_wc__db_status_normal,
                             kind_map, svn_wc__db_kind_subdir));
 
@@ -8352,11 +8350,10 @@ svn_wc__db_temp_set_parent_stub_to_norma
   if (affected_rows == 0)
     {
       /* Worst case: We have to create a new parent stub */
-      SVN_DBG(("Inserting instead\n"));
       SVN_ERR(svn_sqlite__get_statement(&stmt, pdh->wcroot->sdb,
                                         STMT_INSERT_BASE_NODE));
 
-      SVN_ERR(svn_sqlite__bindf(stmt, "is", pdh->wcroot->wc_id, basename));
+      SVN_ERR(svn_sqlite__bindf(stmt, "is", pdh->wcroot->wc_id, base));
       SVN_ERR(svn_sqlite__bind_text(stmt, 5, ""));
       SVN_ERR(svn_sqlite__bind_token(stmt, 6, presence_map,
                                      svn_wc__db_status_normal));