subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1133329 - /subversion/trunk/subversion/libsvn_wc/entries.c
Date Wed, 08 Jun 2011 10:31:40 GMT
Author: philip
Date: Wed Jun  8 10:31:40 2011
New Revision: 1133329

URL: http://svn.apache.org/viewvc?rev=1133329&view=rev
Log:
* subversion/libsvn_wc/entries.c
  (insert_actual_node): Bind tree-conflict to correct column.

Modified:
    subversion/trunk/subversion/libsvn_wc/entries.c

Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1133329&r1=1133328&r2=1133329&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Jun  8 10:31:40 2011
@@ -1495,10 +1495,8 @@ insert_actual_node(svn_sqlite__db_t *sdb
   if (actual_node->changelist)
     SVN_ERR(svn_sqlite__bind_text(stmt, 9, actual_node->changelist));
 
-  /* ### column 10 is text_mod */
-
   if (actual_node->tree_conflict_data)
-    SVN_ERR(svn_sqlite__bind_text(stmt, 11, actual_node->tree_conflict_data));
+    SVN_ERR(svn_sqlite__bind_text(stmt, 10, actual_node->tree_conflict_data));
 
   /* Execute and reset the insert clause. */
   return svn_error_return(svn_sqlite__insert(NULL, stmt));



Mime
View raw message