Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: svn commit: r36926 - trunk/subversion/libsvn_wc

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

Re: svn commit: r36926 - trunk/subversion/libsvn_wc

Author gstein
Full name Greg Stein
Date 2009-04-01 15:49:34 PDT
Message I've verified this fixes diff_test 4.

Cool!

On Wed, Apr 1, 2009 at 19:18, Hyrum K. Wright <hyrum at hyrumwright dot org> wrote:
> Author: hwright
> Date: Wed Apr  1 10:18:51 2009
> New Revision: 36926
>
> Log:
> De-couple the storing of translated size in a WORKING node from
> the checksum.  Also, store NULL in the database, in place of -1
> if the filesize is invalid.
>
> * subversion/libsvn_wc/entries.c
>  (insert_base_node): Don't bind an invalid filesize.
>  (insert_working_node): Bind a valid translated size, even if there
>    isn't a checksum.
>
> Modified:
>   trunk/subversion/lib​svn_wc/entries.c
>
> Modified: trunk/subversion/lib​svn_wc/entries.c
> URL: http://svn.collab.ne​t/viewvc/svn/trunk/s​ubversion/libsvn_wc/​entries.c?pathrev=36​926&r1=36925​&r2=36926
> ====================​====================​====================​==================
> --- trunk/subversion/lib​svn_wc/entries.c        Wed Apr  1 10:06:12 2009        (r36925)
> +++ trunk/subversion/lib​svn_wc/entries.c        Wed Apr  1 10:18:51 2009        (r36926)
> @@ -1695,7 +1695,8 @@ insert_base_node(svn​_sqlite__db_t *wc_db
>                                                       scratch_pool), NULL)));
>     }
>
> -  SVN_ERR(svn_sqlite_​_bind_int64(stmt, 10, base_node->transl​ated_size));
> +  if (base_node->translated_size != SVN_INVALID_FILESIZE)
> +    SVN_ERR(svn_sqlite_​_bind_int64(stmt, 10, base_node->transl​ated_size));
>
>   /* ### strictly speaking, changed_rev should be valid for present nodes. */
>   if (SVN_IS_VALID_REVNUM​(base_node->chang​ed_rev))
> @@ -1780,9 +1781,11 @@ insert_working_node(​svn_sqlite__db_t *wc
>       SVN_ERR(svn_sqlite__​bind_text(stmt, 11, apr_pstrcat(scratch_pool,
>                     kind_str, svn_checksum_to_cstr​ing(working_node-​>checksum,
>                                                       scratch_pool), NULL)));
> -      SVN_ERR(svn_sqlite_​_bind_int64(stmt, 12, working_node->tra​nslated_size));
>     }
>
> +  if (working_node->tr​anslated_size != SVN_INVALID_FILESIZE)
> +    SVN_ERR(svn_sqlite_​_bind_int64(stmt, 12, working_node->tra​nslated_size));
> +
>   if (SVN_IS_VALID_REVNUM​(working_node->ch​anged_rev))
>     SVN_ERR(svn_sqlite__​bind_int64(stmt, 13, working_node->changed_rev));
>   if (working_node->changed_date)
>
> --------------------​--------------------​--------------
> http://subversion.ti​gris.org/ds/viewMess​age.do?dsForumId=495​&dsMessageId=150​9038
>

« Previous message in topic | 1 of 2 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
Re: svn commit: r36926 - trunk/subversion/libsvn_wc gstein Greg Stein 2009-04-01 15:49:34 PDT
     Re: svn commit: r36926 - trunk/subversion/libsvn_wc gstein Greg Stein 2009-04-01 19:37:23 PDT
Messages per page: