Author: julianfoad
Date: Wed Apr 27 12:43:46 2011
New Revision: 1097099
URL: http://svn.apache.org/viewvc?rev=1097099&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(read_info): Fix comments.
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=1097099&r1=1097098&r2=1097099&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Apr 27 12:43:46 2011
@@ -5429,8 +5429,8 @@ read_info(svn_wc__db_status_t *status,
else if (have_act)
{
/* A row in ACTUAL_NODE should never exist without a corresponding
- node in BASE_NODE and/or WORKING_NODE unless it flags a conflict. */
- if (svn_sqlite__column_is_null(stmt_act, 5)) /* conflict_data */
+ node in BASE_NODE and/or WORKING_NODE unless it flags a tree
conflict. */
+ if (svn_sqlite__column_is_null(stmt_act, 5)) /* tree_conflict_data */
err = svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
_("Corrupt data for '%s'"),
path_for_error_message(wcroot, local_relpath,
