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/14 16:22:55 UTC
svn commit: r1092273 - /subversion/trunk/subversion/libsvn_wc/node.c
Author: rhuijben
Date: Thu Apr 14 14:22:54 2011
New Revision: 1092273
URL: http://svn.apache.org/viewvc?rev=1092273&view=rev
Log:
* subversion/libsvn_wc/node.c
(svn_wc__internal_node_get_schedule): For absent, not-present and excluded
nodes return svn_wc_schedule_normal.
Modified:
subversion/trunk/subversion/libsvn_wc/node.c
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1092273&r1=1092272&r2=1092273&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Thu Apr 14 14:22:54 2011
@@ -1235,7 +1235,7 @@ svn_wc__internal_node_get_schedule(svn_w
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_boolean_t has_base;
+ svn_boolean_t has_base, have_work;
const char *copyfrom_relpath;
if (schedule)
@@ -1246,7 +1246,7 @@ svn_wc__internal_node_get_schedule(svn_w
SVN_ERR(svn_wc__db_read_info(&status, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
©from_relpath, NULL, NULL, NULL, NULL,
- &has_base, NULL, NULL, NULL,
+ &has_base, &have_work, NULL, NULL,
db, local_abspath, scratch_pool, scratch_pool));
switch (status)
@@ -1254,11 +1254,10 @@ svn_wc__internal_node_get_schedule(svn_w
case svn_wc__db_status_not_present:
case svn_wc__db_status_absent:
case svn_wc__db_status_excluded:
- return svn_error_createf(SVN_ERR_ENTRY_NOT_FOUND, NULL,
- _("'%s' is not under version control"),
- svn_dirent_local_style(local_abspath,
- scratch_pool));
-
+ /* We used status normal in the entries world. */
+ if (schedule)
+ *schedule = svn_wc_schedule_normal;
+ break;
case svn_wc__db_status_normal:
case svn_wc__db_status_incomplete:
break;