svn commit: r1418479 - /subversion/trunk/subversion/libsvn_wc/wc_db.h

[ju...@apache.org]

Author: julianfoad
Date: Fri Dec  7 21:15:17 2012
New Revision: 1418479

URL: http://svn.apache.org/viewvc?rev=1418479&view=rev
Log:
* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_op_set_props): Indicate that 'conflict' can be null.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.h

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1418479&r1=1418478&r2=1418479&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Fri Dec  7 21:15:17 2012
@@ -1416,8 +1416,8 @@ svn_wc__db_op_add_symlink(svn_wc__db_t *
    If PROPS is NULL, set the properties to be the same as the pristine
    properties.
 
-   CONFLICT is used to register a conflict on this node at the same time
-   the properties are changed.
+   If CONFLICT is not NULL, it is used to register a conflict on this
+   node at the same time the properties are changed.
 
    WORK_ITEMS are inserted into the work queue, as additional things that
    need to be completed before the working copy is stable.