You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by eh...@apache.org on 2010/09/12 17:03:38 UTC
svn commit: r996324 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: ehu
Date: Sun Sep 12 15:03:38 2010
New Revision: 996324
URL: http://svn.apache.org/viewvc?rev=996324&view=rev
Log:
* subversion/libsvn_wc/wc_db.c (assert_base_rows_match): Adjust to 0-based columns.
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=996324&r1=996323&r2=996324&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Sun Sep 12 15:03:38 2010
@@ -423,37 +423,37 @@ assert_base_rows_match(svn_boolean_t hav
have_row1, have_row2, relpath));
if (have_row1) {
- SVN_ERR_ASSERT(svn_sqlite__column_int64(stmt1, 1)
- == svn_sqlite__column_int64(stmt2, 1));
+ SVN_ERR_ASSERT(svn_sqlite__column_int64(stmt1, 0)
+ == svn_sqlite__column_int64(stmt2, 0));
+
+ SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 1, scratch_pool));
SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 2, scratch_pool));
SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 3, scratch_pool));
- SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 4, scratch_pool));
+ SVN_ERR_ASSERT(svn_sqlite__column_revnum(stmt1, 4)
+ == svn_sqlite__column_revnum(stmt2, 4));
- SVN_ERR_ASSERT(svn_sqlite__column_revnum(stmt1, 5)
- == svn_sqlite__column_revnum(stmt2, 5));
+ SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 5, scratch_pool));
SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 6, scratch_pool));
- SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 7, scratch_pool));
+ SVN_ERR_ASSERT(svn_sqlite__column_revnum(stmt1, 7)
+ == svn_sqlite__column_revnum(stmt2, 7));
- SVN_ERR_ASSERT(svn_sqlite__column_revnum(stmt1, 8)
- == svn_sqlite__column_revnum(stmt2, 8));
+ SVN_ERR_ASSERT(svn_sqlite__column_int64(stmt1, 8)
+ == svn_sqlite__column_int64(stmt2, 8));
- SVN_ERR_ASSERT(svn_sqlite__column_int64(stmt1, 9)
- == svn_sqlite__column_int64(stmt2, 9));
+ SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 9, scratch_pool));
SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 10, scratch_pool));
SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 11, scratch_pool));
- SVN_ERR(assert_text_columns_equal(stmt1, stmt2, 12, scratch_pool));
-
- SVN_ERR_ASSERT(svn_sqlite__column_int64(stmt1, 13)
- == svn_sqlite__column_int64(stmt2, 13));
+ SVN_ERR_ASSERT(svn_sqlite__column_int64(stmt1, 12)
+ == svn_sqlite__column_int64(stmt2, 12));
/* 14: verify props? */
}