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

[ph...@apache.org]

Author: philip
Date: Tue Oct 19 11:45:54 2010
New Revision: 1024206

URL: http://svn.apache.org/viewvc?rev=1024206&view=rev
Log:
Followup to r1024187.

Suggested by: rhuijben

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_op_read_tree_conflict): Use local_relpath to avoid path
   manipulation.

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=1024206&r1=1024205&r2=1024206&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Oct 19 11:45:54 2010
@@ -3921,7 +3921,7 @@ svn_wc__db_op_read_tree_conflict(
                      apr_pool_t *scratch_pool)
 {
   svn_wc__db_pdh_t *pdh;
-  const char *local_relpath, *child_path;
+  const char *local_relpath;
 
   SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
 
@@ -3929,8 +3929,7 @@ svn_wc__db_op_read_tree_conflict(
                               local_abspath, svn_sqlite__mode_readonly,
                               scratch_pool, scratch_pool));
 
-  child_path = svn_dirent_skip_ancestor(pdh->wcroot->abspath, local_abspath);
-  if (child_path != local_abspath && child_path[0])
+  if (local_relpath[0])
     {
       const char * parent_abspath;
       apr_hash_t *tree_conflicts;