Author: rhuijben
Date: Tue Aug 3 14:19:19 2010
New Revision: 981897
URL: http://svn.apache.org/viewvc?rev=981897&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(complete_directory): In single-db mode, don't worry about stubs being
out of sync with their in-directory data.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=981897&r1=981896&r2=981897&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Aug 3 14:19:19
2010
@@ -824,6 +824,7 @@ complete_directory(struct edit_baton *eb
node_abspath = svn_dirent_join(local_abspath, name, iterpool);
+#ifndef SVN_WC__SINGLE_DB
/* ### there is an edge case that we can run into right now: this
### dir can have a "subdir" node in the BASE_NODE, but the
### actual subdir does NOT have a record.
@@ -841,12 +842,16 @@ complete_directory(struct edit_baton *eb
### the "subdir" record. maybe there is a good place to remove
### that record (or wait for single-dir). for now, we can correct
### it when we detect it. */
+#endif
err = svn_wc__db_base_get_info(&status, &kind, &revnum,
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
eb->db, node_abspath,
iterpool, iterpool);
+#ifdef SVN_WC__SINGLE_DB
+ SVN_ERR(err);
+#else
if (err)
{
if (err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND)
@@ -858,6 +863,7 @@ complete_directory(struct edit_baton *eb
iterpool));
continue;
}
+#endif
/* ### obsolete comment?
Any entry still marked as deleted (and not schedule add) can now
