You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/08/04 16:56:42 UTC
svn commit: r982275 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: rhuijben
Date: Wed Aug 4 14:56:41 2010
New Revision: 982275
URL: http://svn.apache.org/viewvc?rev=982275&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(set_new_dir_to_incomplete_baton_txn): Following up on recent discussion,
just store infinite depth even though it is mostly equivalent to depth
unknown. Currently all other places in wc_db.c store depth infinity
literally
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=982275&r1=982274&r2=982275&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Aug 4 14:56:41 2010
@@ -9657,8 +9657,8 @@ set_new_dir_to_incomplete_baton_txn(void
SVN_ERR(svn_sqlite__get_statement(&stmt, dtb->pdh->wcroot->sdb,
STMT_DELETE_NODE_DATA_LAYERS));
SVN_ERR(svn_sqlite__bindf(stmt, "isi", dtb->pdh->wcroot->wc_id,
- dtb->local_relpath,
- (apr_int64_t)0));
+ dtb->local_relpath,
+ (apr_int64_t)0));
SVN_ERR(svn_sqlite__step_done(stmt));
#endif
@@ -9674,8 +9674,8 @@ set_new_dir_to_incomplete_baton_txn(void
parent_relpath,
(apr_int64_t)dtb->revision));
- /* If depth not unknown or infinity: record depth */
- if (dtb->depth >= svn_depth_empty && dtb->depth < svn_depth_infinity)
+ /* If depth is not unknown: record depth */
+ if (dtb->depth >= svn_depth_empty && dtb->depth <= svn_depth_infinity)
SVN_ERR(svn_sqlite__bind_text(stmt, 7, svn_depth_to_word(dtb->depth)));
SVN_ERR(svn_sqlite__step_done(stmt));
Re: svn commit: r982275 -
/subversion/trunk/subversion/libsvn_wc/wc_db.c
Posted by Stefan Sperling <st...@elego.de>.
On Wed, Aug 04, 2010 at 02:56:42PM -0000, rhuijben@apache.org wrote:
> Author: rhuijben
> Date: Wed Aug 4 14:56:41 2010
> New Revision: 982275
>
> URL: http://svn.apache.org/viewvc?rev=982275&view=rev
> Log:
> * subversion/libsvn_wc/wc_db.c
> (set_new_dir_to_incomplete_baton_txn): Following up on recent discussion,
> just store infinite depth even though it is mostly equivalent to depth
> unknown. Currently all other places in wc_db.c store depth infinity
> literally
>
> 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=982275&r1=982274&r2=982275&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Aug 4 14:56:41 2010
> @@ -9657,8 +9657,8 @@ set_new_dir_to_incomplete_baton_txn(void
> SVN_ERR(svn_sqlite__get_statement(&stmt, dtb->pdh->wcroot->sdb,
> STMT_DELETE_NODE_DATA_LAYERS));
> SVN_ERR(svn_sqlite__bindf(stmt, "isi", dtb->pdh->wcroot->wc_id,
> - dtb->local_relpath,
> - (apr_int64_t)0));
> + dtb->local_relpath,
> + (apr_int64_t)0));
> SVN_ERR(svn_sqlite__step_done(stmt));
> #endif
The above is just an indentation change, right? It's not mentioned
in the log, so either you've committed it by accident or forgot to
mention it.
> @@ -9674,8 +9674,8 @@ set_new_dir_to_incomplete_baton_txn(void
> parent_relpath,
> (apr_int64_t)dtb->revision));
>
> - /* If depth not unknown or infinity: record depth */
> - if (dtb->depth >= svn_depth_empty && dtb->depth < svn_depth_infinity)
> + /* If depth is not unknown: record depth */
> + if (dtb->depth >= svn_depth_empty && dtb->depth <= svn_depth_infinity)
> SVN_ERR(svn_sqlite__bind_text(stmt, 7, svn_depth_to_word(dtb->depth)));
>
> SVN_ERR(svn_sqlite__step_done(stmt));
>