svn commit: r1427852 - /subversion/trunk/subversion/libsvn_wc/props.c

[ju...@apache.org]

Author: julianfoad
Date: Wed Jan  2 16:26:45 2013
New Revision: 1427852

URL: http://svn.apache.org/viewvc?rev=1427852&view=rev
Log:
* subversion/libsvn_wc/props.c
  (apply_single_prop_change): Fix outdated parts of the doc string.

Modified:
    subversion/trunk/subversion/libsvn_wc/props.c

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1427852&r1=1427851&r2=1427852&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Wed Jan  2 16:26:45 2013
@@ -1004,11 +1004,8 @@ apply_single_generic_prop_change(const s
   return SVN_NO_ERROR;
 }
 
-/* Change the property with name PROPNAME in the set of ACTUAL_PROPS,
- * setting *STATE or *CONFLICT_REMAINS according to the merge outcome.
- *
- * *STATE is an input and output parameter, its value is to be
- * set using set_prop_merge_state(). (May be null.).
+/* Change the property with name PROPNAME, setting *RESULT_VAL,
+ * *CONFLICT_REMAINS and *DID_MERGE according to the merge outcome.
  *
  * BASE_VAL contains the working copy base property value. (May be null.)
  *
@@ -1016,6 +1013,8 @@ apply_single_generic_prop_change(const s
  * thinks it's overwriting. (Not null.)
  *
  * NEW_VAL contains the value to be set. (Not null.)
+ *
+ * WORKING_VAL contains the working copy actual value. (May be null.)
  */
 static svn_error_t *
 apply_single_prop_change(const svn_string_t **result_val,