svn commit: r1095313 - /subversion/trunk/subversion/include/svn_wc.h

[rh...@apache.org]

Author: rhuijben
Date: Wed Apr 20 08:11:36 2011
New Revision: 1095313

URL: http://svn.apache.org/viewvc?rev=1095313&view=rev
Log:
* subversion/include/svn_wc.h
  (svn_wc_status3_t): Make the documentation match the implementation. On the
    wc layer we don't override the node status for conflicts.
    (In svn_client_status_t we do)

Modified:
    subversion/trunk/subversion/include/svn_wc.h

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1095313&r1=1095312&r2=1095313&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Wed Apr 20 08:11:36 2011
@@ -3415,11 +3415,11 @@ typedef struct svn_wc_status3_t
   /** Set to TRUE if the item is the victim of a conflict. */
   svn_boolean_t conflicted;
 
-  /** The status of the node itself. In order of precedence: Tree conflicts,
-   * structural changes, text changes (including text conflicts). */
+  /** The status of the node itself. In order of precedence: Obstructions,
+   * structural changes, text changes. */
   enum svn_wc_status_kind node_status;
 
-  /** The status of the entry itself, including its text if it is a file. */
+  /** The status of the entry's text. */
   enum svn_wc_status_kind text_status;
 
   /** The status of the entry's properties. */