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/05/03 23:49:35 UTC
svn commit: r1099276 - /subversion/trunk/subversion/libsvn_wc/entries.c
Author: rhuijben
Date: Tue May 3 21:49:34 2011
New Revision: 1099276
URL: http://svn.apache.org/viewvc?rev=1099276&view=rev
Log:
Following up on r1081797, don't assume that file externals are 'added'.
* subversion/libsvn_wc/entries.c
(read_one_entry): Remove update_root check as this doesn't work when
we don't go through a code path that can obtain this value.
Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1099276&r1=1099275&r2=1099276&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Tue May 3 21:49:34 2011
@@ -396,7 +396,6 @@ read_one_entry(const svn_wc_entry_t **ne
svn_boolean_t conflicted;
svn_boolean_t have_base;
svn_boolean_t have_more_work;
- svn_boolean_t update_root = FALSE;
entry->name = name;
@@ -570,7 +569,7 @@ read_one_entry(const svn_wc_entry_t **ne
NULL, NULL, NULL,
NULL, NULL, NULL,
NULL, NULL,
- &update_root, NULL,
+ NULL, NULL,
db, entry_abspath,
scratch_pool,
scratch_pool));
@@ -918,7 +917,8 @@ read_one_entry(const svn_wc_entry_t **ne
/* Let's check for a file external.
### right now this is ugly, since we have no good way querying
### for a file external OR retrieving properties. ugh. */
- if (update_root && entry->kind == svn_node_file)
+ if (status == svn_wc__db_status_normal
+ && kind == svn_wc__db_kind_file)
SVN_ERR(check_file_external(entry, db, entry_abspath, result_pool,
scratch_pool));