svn commit: r1693447 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

[st...@apache.org]

Author: stsp
Date: Thu Jul 30 15:56:43 2015
New Revision: 1693447

URL: http://svn.apache.org/r1693447
Log:
* subversion/libsvn_wc/conflicts.c
  (resolve_tree_conflict_on_node): Improve documentation of resolve_later
   argument in docstring.

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

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1693447&r1=1693446&r2=1693447&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Jul 30 15:56:43 2015
@@ -2598,9 +2598,11 @@ resolve_prop_conflict_on_node(svn_boolea
  *
  * It is not an error if there is no tree conflict.
  *
- * If the conflict can't be resolved yet because another tree conflict is
- * blocking a storage location, store the tree conflict in the RESOLVE_LATER
- * hash.
+ * If the conflict can't be resolved yet (e.g. because another tree conflict
+ * is blocking a storage location), and RESOLVE_LATER is not NULL, store the
+ * tree conflict in RESOLVE_LATER and do not mark the conflict resolved.
+ * Else if RESOLVE_LATER is NULL, do not mark the conflict resolved and
+ * return the error which prevented the conflict from being marked resolved.
  */
 static svn_error_t *
 resolve_tree_conflict_on_node(svn_boolean_t *did_resolve,