svn commit: r964641 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Jul 15 23:32:32 2010
New Revision: 964641

URL: http://svn.apache.org/viewvc?rev=964641&view=rev
Log:
Following up on r961784, minor cleanup.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_APPLY_CHANGES_TO_BASE): Remove obsolete comment.

* subversion/libsvn_wc/wc_db.c
  (commit_baton): Use svn_revnum_t for revisions.
  (commit_node): Cast revisions to apr_int64_t.

Suggested by: gstein

Modified:
    subversion/trunk/subversion/libsvn_wc/wc-queries.sql
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-queries.sql?rev=964641&r1=964640&r2=964641&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu Jul 15 23:32:32 2010
@@ -403,7 +403,6 @@ INSERT OR REPLACE INTO BASE_NODE (
   wc_id, local_relpath, parent_relpath, presence, kind, revnum, changed_rev,
   changed_author, properties, repos_id, repos_relpath, checksum, changed_date,
   depth, symlink_target, dav_cache)
-/* NOTE: ?6 is duplicated because we insert the same value in two columns.  */
 VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16);
 
 -- STMT_INSERT_WORKING_NODE_FROM_BASE_NODE

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=964641&r1=964640&r2=964641&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jul 15 23:32:32 2010
@@ -5400,8 +5400,8 @@ struct commit_baton {
   svn_wc__db_pdh_t *pdh;
   const char *local_relpath;
 
-  apr_int64_t new_revision;
-  apr_int64_t changed_rev;
+  svn_revnum_t new_revision;
+  svn_revnum_t changed_rev;
   apr_time_t changed_date;
   const char *changed_author;
   const svn_checksum_t *new_checksum;
@@ -5538,8 +5538,8 @@ commit_node(void *baton, svn_sqlite__db_
                             parent_relpath,
                             presence_map, new_presence,
                             kind_map, new_kind,
-                            cb->new_revision,
-                            cb->changed_rev,
+                            (apr_int64_t)cb->new_revision,
+                            (apr_int64_t)cb->changed_rev,
                             cb->changed_author,
                             prop_blob.data, prop_blob.len));