Author: gstein
Date: Thu Apr 22 17:16:59 2010
New Revision: 936970

URL: http://svn.apache.org/viewvc?rev=936970&view=rev
Log:
svn_wc__get_entry can sometimes return SVN_ERR_WC_NOT_WORKING_COPY, which
we need to look for when running 'svn status' at the root of a working
copy (the "parent" is not a working copy, so we need to catch it).

* subversion/libsvn_wc/status.c:
  (internal_status): catch SVN_ERR_WC_NOT_WORKING_COPY

Modified:
    subversion/trunk/subversion/libsvn_wc/status.c

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=936970&r1=936969&r2=936970&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Thu Apr 22 17:16:59 2010
@@ -2380,6 +2380,7 @@ internal_status(svn_wc_status3_t **statu
   err = svn_wc__get_entry(&entry, db, local_abspath, TRUE,
                           svn_node_unknown, FALSE, scratch_pool, scratch_pool);
   if (err && (err->apr_err == SVN_ERR_WC_MISSING
+                || err->apr_err == SVN_ERR_WC_NOT_WORKING_COPY
                 || err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND
                 || err->apr_err == SVN_ERR_NODE_UNEXPECTED_KIND))
     {
@@ -2406,6 +2407,7 @@ internal_status(svn_wc_status3_t **statu
       err = svn_wc__get_entry(&parent_entry, db, parent_abspath, TRUE,
                               svn_node_dir, FALSE, scratch_pool, scratch_pool);
       if (err && (err->apr_err == SVN_ERR_WC_MISSING
+                    || err->apr_err == SVN_ERR_WC_NOT_WORKING_COPY
                     || err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND
                     || err->apr_err == SVN_ERR_NODE_UNEXPECTED_KIND))
         {


Reply via email to