svn commit: r1432250 - /subversion/trunk/subversion/libsvn_wc/conflicts.h

[ju...@apache.org]

Author: julianfoad
Date: Fri Jan 11 19:51:19 2013
New Revision: 1432250

URL: http://svn.apache.org/viewvc?rev=1432250&view=rev
Log:
* subversion/libsvn_wc/conflicts.h
  (svn_wc__conflict_read_info): Document the LOCATIONS output.

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

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1432250&r1=1432249&r2=1432250&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Fri Jan 11 19:51:19 2013
@@ -262,9 +262,12 @@ svn_wc__conflict_skel_resolve(svn_boolea
  *
  * Output arguments can be NULL if the value is not necessary.
  *
- * ### stsp asks: what is LOCATIONS?
- * ### Set *LOCATIONS to an array of (svn_wc_conflict_version_t *)
- *     representing ...
+ * Set *LOCATIONS to an array of (svn_wc_conflict_version_t *).  For
+ * conflicts written by current code, there are 2 elements: index [0] is
+ * the 'old' or 'left' side and [1] is the 'new' or 'right' side.
+ *
+ * For conflicts written by 1.6 or 1.7 there are 2 locations for a tree
+ * conflict, but none for a text or property conflict.
  *
  * TEXT_, PROP_ and TREE_CONFLICTED (when not NULL) will be set to TRUE
  * when the conflict contains the specified kind of conflict, otherwise