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

[rh...@apache.org]

Author: rhuijben
Date: Wed Sep  1 18:28:15 2010
New Revision: 991638

URL: http://svn.apache.org/viewvc?rev=991638&view=rev
Log:
* subversion/libsvn_wc/status.c
  (assemble_status): Remove an old fallback from when svn_wc__db_read_info()
    didn't get the tree conflict status on versioned nodes.

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=991638&r1=991637&r2=991638&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Wed Sep  1 18:28:15 2010
@@ -525,19 +525,7 @@ assemble_status(svn_wc_status3_t **statu
         text_status = svn_wc_status_modified;
     }
 
-  /* While tree conflicts aren't stored on the node themselves, check
-     explicitly for tree conflicts to allow our users to ignore this detail */
-  if (!conflicted)
-    {
-      const svn_wc_conflict_description2_t *tree_conflict;
-
-      SVN_ERR(svn_wc__db_op_read_tree_conflict(&tree_conflict,
-                                               db, local_abspath,
-                                               scratch_pool, scratch_pool));
-
-      conflicted = (tree_conflict != NULL);
-    }
-  else
+  if (conflicted)
     {
       svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted;