You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/05/03 19:28:16 UTC
svn commit: r1099143 - /subversion/trunk/subversion/libsvn_wc/info.c
Author: hwright
Date: Tue May 3 17:28:15 2011
New Revision: 1099143
URL: http://svn.apache.org/viewvc?rev=1099143&view=rev
Log:
* subversion/libsvn_wc/info.c
(info_found_node_callback): Use the wc_db function to retrieve tree conflict
information.
Modified:
subversion/trunk/subversion/libsvn_wc/info.c
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1099143&r1=1099142&r2=1099143&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Tue May 3 17:28:15 2011
@@ -266,8 +266,8 @@ info_found_node_callback(const char *loc
const svn_wc_conflict_description2_t *tree_conflict = NULL;
svn_error_t *err;
- SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, fe_baton->wc_ctx,
- local_abspath, pool, pool));
+ SVN_ERR(svn_wc__db_op_read_tree_conflict(&tree_conflict, fe_baton->wc_ctx->db,
+ local_abspath, pool, pool));
err = build_info_for_entry(&info, fe_baton->wc_ctx, local_abspath,
kind, pool, pool);