subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r950010 - /subversion/trunk/subversion/libsvn_wc/util.c
Date Tue, 01 Jun 2010 10:49:19 GMT
Author: rhuijben
Date: Tue Jun  1 10:49:18 2010
New Revision: 950010

URL: http://svn.apache.org/viewvc?rev=950010&view=rev
Log:
* subversion/libsvn_wc/util.c
  (svn_wc__status2_from_3): Only retrieve an entry for versioned paths.

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

Modified: subversion/trunk/subversion/libsvn_wc/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/util.c?rev=950010&r1=950009&r2=950010&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/util.c Tue Jun  1 10:49:18 2010
@@ -546,7 +546,7 @@ svn_wc__cd_to_cd2(const svn_wc_conflict_
 
 svn_error_t *
 svn_wc__status2_from_3(svn_wc_status2_t **status,
-                       const svn_wc_status3_t *old_status, 
+                       const svn_wc_status3_t *old_status,
                        svn_wc_context_t *wc_ctx,
                        const char *local_abspath,
                        apr_pool_t *result_pool,
@@ -564,9 +564,10 @@ svn_wc__status2_from_3(svn_wc_status2_t 
 
   *status = apr_pcalloc(result_pool, sizeof(**status));
 
-  SVN_ERR(svn_wc__get_entry(&entry, wc_ctx->db, local_abspath, TRUE,
-                            svn_node_unknown, FALSE, result_pool,
-                            scratch_pool));
+  if (old_status->versioned)
+    SVN_ERR(svn_wc__get_entry(&entry, wc_ctx->db, local_abspath, TRUE,
+                              svn_node_unknown, FALSE, result_pool,
+                              scratch_pool));
 
   SVN_ERR(svn_wc__db_op_read_tree_conflict(&tree_conflict, wc_ctx->db,
                                            local_abspath, scratch_pool,



Mime
View raw message