Author: rhuijben
Date: Sat Jun 30 22:12:21 2012
New Revision: 1355830
URL: http://svn.apache.org/viewvc?rev=1355830&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(read_children_info): Fix >=SVN_WC__USES_CONFLICT_SKELS code.
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=1355830&r1=1355829&r2=1355830&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Sat Jun 30 22:12:21 2012
@@ -7824,11 +7824,7 @@ read_children_info(void *baton,
!svn_sqlite__column_is_null(stmt, 7) || /* prop */
!svn_sqlite__column_is_null(stmt, 8); /* tree */
#else
- child->conflicted = !svn_sqlite__column_is_null(stmt, 3) || /* old */
- !svn_sqlite__column_is_null(stmt, 3) || /* new */
- !svn_sqlite__column_is_null(stmt, 4) || /* work */
- !svn_sqlite__column_is_null(stmt, 0) || /* prop */
- !svn_sqlite__column_is_null(stmt, 5); /* tree */
+ child->conflicted = !svn_sqlite__column_is_null(stmt, 3); /* conflict */
#endif
if (child->conflicted)
