svn commit: r1417898 - in /subversion/trunk/subversion/libsvn_wc: props.c props.h

[ju...@apache.org]

Author: julianfoad
Date: Thu Dec  6 14:18:14 2012
New Revision: 1417898

URL: http://svn.apache.org/viewvc?rev=1417898&view=rev
Log:
Fix doc strings.

* subversion/libsvn_wc/props.h
  (svn_wc__merge_props): Update doc string, following changes made in
    r1355114.

* subversion/libsvn_wc/props.c
  (apply_single_prop_add, apply_single_prop_delete,
   apply_single_prop_change, svn_wc__merge_props): Update out-of-date
    parameter names in doc strings.

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

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1417898&r1=1417897&r2=1417898&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Thu Dec  6 14:18:14 2012
@@ -785,7 +785,8 @@ set_prop_merge_state(svn_wc_notify_state
 }
 
 /* Add the property with name PROPNAME to the set of ACTUAL_PROPS on
- * PATH, setting *STATE or *CONFLICT_REMAINS according to merge outcomes.
+ * DB/LOCAL_ABSPATH, 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_merge_prop_state().
@@ -868,9 +869,9 @@ apply_single_prop_add(svn_wc_notify_stat
 }
 
 
-/* Delete the property with name PROPNAME from the set of
- * ACTUAL_PROPS on PATH, setting *STATE or *CONFLICT_REMAINS according to
- * merge outcomes.
+/* Delete the property with name PROPNAME from the set of ACTUAL_PROPS on
+ * DB/LOCAL_ABSPATH, 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_merge_prop_state().
@@ -1087,8 +1088,9 @@ apply_single_generic_prop_change(svn_wc_
   return SVN_NO_ERROR;
 }
 
-/* Change the property with name PROPNAME in the set of ACTUAL_PROPS
- * on PATH, setting *STATE or *CONFLICT_REMAINS according to the merge outcome.
+/* Change the property with name PROPNAME in the set of ACTUAL_PROPS on
+ * DB/LOCAL_ABSPATH, 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.).
@@ -1684,7 +1686,7 @@ get_file_for_validation(const svn_string
     {
       svn_stream_t *read_stream;
 
-      /* Open PATH. */
+      /* Open GB->LOCAL_ABSPATH. */
       SVN_ERR(svn_stream_open_readonly(&read_stream, gb->local_abspath,
                                        pool, pool));
 

Modified: subversion/trunk/subversion/libsvn_wc/props.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.h?rev=1417898&r1=1417897&r2=1417898&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.h (original)
+++ subversion/trunk/subversion/libsvn_wc/props.h Thu Dec  6 14:18:14 2012
@@ -73,9 +73,6 @@ svn_wc__internal_propget(const svn_strin
    SERVER_BASEPROPS, calculate what changes should be applied to the working
    copy.
 
-   Return working queue operations in WORK_ITEMS and a new set of actual
-   (NEW_ACTUAL_PROPS) and pristine properties (NEW_PRISTINE_PROPS).
-
    We return the new property collections to the caller, so the caller
    can combine the property update with other operations.
 
@@ -86,13 +83,15 @@ svn_wc__internal_propget(const svn_strin
    change both the pristine and working properties. (Only the update editor
    should use BASE_MERGE is TRUE)
 
-   If conflicts are found when merging, create a temporary .prej file,
-   and provide working queue operations to write the conflict information
-   into the .prej file later. Modify base properties unconditionally,
-   if BASE_MERGE is TRUE, they do not generate conficts.
-
    TODO ### DRY_RUN ...
 
+   Return the new set of actual properties in *NEW_ACTUAL_PROPS, and the
+   new set of pristine properties in NEW_PRISTINE_PROPS.
+
+   Return any conflicts of the actual props in *CONFLICT_SKEL.  (Changes
+   made to the pristine properties, if BASE_MERGE is TRUE, do not
+   generate conficts.)
+
    If STATE is non-null, set *STATE to the state of the local properties
    after the merge.  */
 svn_error_t *