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 2011/04/15 13:55:28 UTC
svn commit: r1092673 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c
workqueue.c
Author: rhuijben
Date: Fri Apr 15 11:55:28 2011
New Revision: 1092673
URL: http://svn.apache.org/viewvc?rev=1092673&view=rev
Log:
* subversion/libsvn_wc/workqueue.c
(log_do_committed): Just fetch the properties modified flag from read_info.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1092673&r1=1092672&r2=1092673&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Apr 15 11:55:28 2011
@@ -245,8 +245,6 @@ svn_wc__process_committed_internal(svn_w
{
svn_wc__db_kind_t kind;
- SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, TRUE, scratch_pool));
-
SVN_ERR(process_committed_leaf(db, local_abspath, !top_of_recurse,
new_revnum, new_date, rev_author,
new_dav_cache,
@@ -254,19 +252,16 @@ svn_wc__process_committed_internal(svn_w
sha1_checksum,
scratch_pool));
+ /* Only check kind after processing the node itself. The node might
+ have been deleted */
+ SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, TRUE, scratch_pool));
+
if (recurse && kind == svn_wc__db_kind_dir)
{
const apr_array_header_t *children;
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i;
- /* Run the log. It might delete this node, leaving us nothing
- more to do. */
- SVN_ERR(svn_wc__wq_run(db, local_abspath, NULL, NULL, iterpool));
- SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, TRUE, iterpool));
- if (kind == svn_wc__db_kind_unknown)
- return SVN_NO_ERROR; /* it got deleted! */
-
/* Read PATH's entries; this is the absolute path. */
SVN_ERR(svn_wc__db_read_children(&children, db, local_abspath,
scratch_pool, iterpool));
@@ -327,11 +322,7 @@ svn_wc__process_committed_internal(svn_w
keep_changelist,
sha1_checksum,
queue, iterpool));
-
- if (kind == svn_wc__db_kind_dir)
- SVN_ERR(svn_wc__wq_run(db, this_abspath, NULL, NULL, iterpool));
}
-
svn_pool_destroy(iterpool);
}
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1092673&r1=1092672&r2=1092673&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Fri Apr 15 11:55:28 2011
@@ -614,7 +614,7 @@ log_do_committed(svn_wc__db_t *db,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
- NULL, NULL, NULL,
+ &prop_mods, NULL, NULL,
NULL, NULL,
db, local_abspath,
scratch_pool, scratch_pool));
@@ -701,7 +701,6 @@ log_do_committed(svn_wc__db_t *db,
/* Install the node's current working props as its new base props.
* Remember some details about the prop changes, for later use. */
- SVN_ERR(svn_wc__props_modified(&prop_mods, db, local_abspath, pool));
if (prop_mods)
{
if (kind == svn_wc__db_kind_file)