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/03/07 18:45:57 UTC
svn commit: r920046 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: rhuijben
Date: Sun Mar 7 17:45:57 2010
New Revision: 920046
URL: http://svn.apache.org/viewvc?rev=920046&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(open_directory):
Following up upon r920033, always check for incomplete in the
BASE_NODE table, as we are not interested in other incomplete
states.
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=920046&r1=920045&r2=920046&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Sun Mar 7 17:45:57 2010
@@ -2979,10 +2979,10 @@
svn_wc_entry_t tmp_entry;
apr_uint64_t flags = SVN_WC__ENTRY_MODIFY_REVISION |
SVN_WC__ENTRY_MODIFY_URL;
-
+ svn_boolean_t base_shadowed;
svn_boolean_t already_conflicted;
svn_wc_conflict_description2_t *tree_conflict = NULL;
- svn_wc__db_status_t status;
+ svn_wc__db_status_t status, base_status;
SVN_ERR(make_dir_baton(&db, path, eb, pb, FALSE, pool));
*child_baton = db;
@@ -3009,11 +3009,20 @@
SVN_ERR(svn_wc__db_read_info(&status, NULL, &db->old_revision, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
&db->ambient_depth, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ &base_shadowed, NULL, NULL,
eb->db, db->local_abspath, pool, pool));
- db->was_incomplete = (status == svn_wc__db_status_incomplete);
+ if (!base_shadowed)
+ base_status = status;
+ else
+ SVN_ERR(svn_wc__db_base_get_info(&base_status, NULL, &db->old_revision,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ &db->ambient_depth, NULL, NULL, NULL,
+ NULL,
+ eb->db, db->local_abspath, pool, pool));
+
+ db->was_incomplete = (base_status == svn_wc__db_status_incomplete);
/* Is this path a conflict victim? */
SVN_ERR(node_already_conflicted(&already_conflicted, eb->db,