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 2010/10/25 22:56:10 UTC
svn commit: r1027265 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: hwright
Date: Mon Oct 25 20:56:10 2010
New Revision: 1027265
URL: http://svn.apache.org/viewvc?rev=1027265&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
(resolve_conflict_on_node): Use a more efficient wc_db API to fetch the node
kind.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1027265&r1=1027264&r2=1027265&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Oct 25 20:56:10 2010
@@ -190,11 +190,7 @@ resolve_conflict_on_node(svn_wc__db_t *d
*did_resolve = FALSE;
- SVN_ERR(svn_wc__db_read_info(NULL, &kind, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL,
- db, local_abspath, pool, pool));
+ SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, TRUE, pool));
SVN_ERR(svn_wc__db_read_conflicts(&conflicts, db, local_abspath,
pool, pool));