svn commit: r1090413 - /subversion/trunk/subversion/libsvn_wc/status.c

[rh...@apache.org]

Author: rhuijben
Date: Fri Apr  8 19:39:29 2011
New Revision: 1090413

URL: http://svn.apache.org/viewvc?rev=1090413&view=rev
Log:
Don't show the root of a working copy as switched if it is contained in a
different working copy. (Problem found via commit_tests.py 25, which fails
fails for the right reason after this patch)

* subversion/libsvn_wc/status.c
  (internal_status): Don't fetch parent node repos information if our node
    is the wcroot.

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=1090413&r1=1090412&r2=1090413&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Fri Apr  8 19:39:29 2011
@@ -2484,6 +2484,7 @@ internal_status(svn_wc_status3_t **statu
   const char *parent_repos_relpath;
   const char *parent_repos_root_url;
   svn_wc__db_status_t node_status;
+  svn_boolean_t is_root = FALSE;
   svn_error_t *err;
 
   SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -2515,7 +2516,12 @@ internal_status(svn_wc_status3_t **statu
                                                  FALSE /* is_ignored */,
                                                  result_pool, scratch_pool));
 
-  if (!svn_dirent_is_root(local_abspath, strlen(local_abspath)))
+  if (svn_dirent_is_root(local_abspath, strlen(local_abspath)))
+    is_root = TRUE;
+  else
+    SVN_ERR(svn_wc__db_is_wcroot(&is_root, db, local_abspath, scratch_pool));
+
+  if (!is_root)
     {
       svn_wc__db_status_t parent_status;
       const char *parent_abspath = svn_dirent_dirname(local_abspath,