You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by da...@apache.org on 2010/05/02 00:20:27 UTC

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

Author: dannas
Date: Sat May  1 22:20:27 2010
New Revision: 940118

URL: http://svn.apache.org/viewvc?rev=940118&view=rev
Log:
Follow-up to r940111. Add doc comment to the new 'conflicted' field.

* subversion/include/svn_wc.h
  (svn_wc_status3_t): See above.

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=940118&r1=940117&r2=940118&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Sat May  1 22:20:27 2010
@@ -3644,6 +3644,9 @@ typedef struct svn_wc_status3_t
    */
   apr_time_t lock_creation_date;
   
+  /** Set to TRUE if the item is the victim of a text conflict, property
+   * conflict or tree conflict. 
+   * */
   svn_boolean_t conflicted;
 
   /* NOTE! Please update svn_wc_dup_status3() when adding new fields here. */