You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/03/30 10:51:36 UTC
svn commit: r1307315 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: philip
Date: Fri Mar 30 08:51:36 2012
New Revision: 1307315
URL: http://svn.apache.org/viewvc?rev=1307315&view=rev
Log:
* subversion/libsvn_wc/wc_db.c (scan_deletion_txn): Add an early return.
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=1307315&r1=1307314&r2=1307315&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Mar 30 08:51:36 2012
@@ -10280,6 +10280,13 @@ scan_deletion_txn(void *baton,
err = get_moved_to(sd_baton, &scan, stmt, current_relpath,
wcroot, local_relpath, scratch_pool);
SVN_ERR(svn_error_compose_create(err, svn_sqlite__reset(stmt)));
+ if (!scan
+ && !sd_baton->base_del_relpath && !sd_baton->work_del_relpath)
+ {
+ /* We have all we need, exit early */
+ SVN_ERR(svn_sqlite__reset(stmt));
+ return SVN_NO_ERROR;
+ }
}
if(current_depth <= op_depth)
RE: svn commit: r1307315 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: philip@apache.org [mailto:philip@apache.org]
> Sent: vrijdag 30 maart 2012 10:52
> To: commits@subversion.apache.org
> Subject: svn commit: r1307315 -
> /subversion/trunk/subversion/libsvn_wc/wc_db.c
>
> Author: philip
> Date: Fri Mar 30 08:51:36 2012
> New Revision: 1307315
>
> URL: http://svn.apache.org/viewvc?rev=1307315&view=rev
> Log:
> * subversion/libsvn_wc/wc_db.c (scan_deletion_txn): Add an early return.
>
> 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=1307315&r1=1307314&r2=1307315&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
> +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Mar 30 08:51:36
> 2012
> @@ -10280,6 +10280,13 @@ scan_deletion_txn(void *baton,
> err = get_moved_to(sd_baton, &scan, stmt, current_relpath,
> wcroot, local_relpath, scratch_pool);
> SVN_ERR(svn_error_compose_create(err, svn_sqlite__reset(stmt)));
This line performs a reset.
> + if (!scan
> + && !sd_baton->base_del_relpath && !sd_baton-
> >work_del_relpath)
> + {
> + /* We have all we need, exit early */
> + SVN_ERR(svn_sqlite__reset(stmt));
And here is another one.
Only one of those is necessary.
Bert
> + return SVN_NO_ERROR;
> + }
> }
>
> if(current_depth <= op_depth)
>