You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/05/21 16:25:56 UTC
svn commit: r947022 - /subversion/trunk/subversion/libsvn_wc/adm_files.c
Author: julianfoad
Date: Fri May 21 14:25:56 2010
New Revision: 947022
URL: http://svn.apache.org/viewvc?rev=947022&view=rev
Log:
* subversion/libsvn_wc/adm_files.c
(svn_wc__ultimate_base_text_path): Stop using an svn_wc_entry_t.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_files.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=947022&r1=947021&r2=947022&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Fri May 21 14:25:56 2010
@@ -295,12 +295,18 @@ svn_wc__ultimate_base_text_path(const ch
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- const svn_wc_entry_t *entry;
+ svn_error_t *err;
svn_boolean_t replaced;
- SVN_ERR(svn_wc__get_entry(&entry, db, local_abspath, TRUE, svn_node_file,
- FALSE, scratch_pool, scratch_pool));
- replaced = entry && entry->schedule == svn_wc_schedule_replace;
+ err = svn_wc__internal_is_replaced(&replaced, db, local_abspath,
+ scratch_pool);
+ if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
+ {
+ svn_error_clear(err);
+ replaced = FALSE;
+ }
+ else
+ SVN_ERR(err);
if (replaced)
SVN_ERR(svn_wc__text_revert_path(result_abspath, db, local_abspath,