Author: julianfoad
Date: Fri Jan 25 20:35:11 2013
New Revision: 1438690
URL: http://svn.apache.org/viewvc?rev=1438690&view=rev
Log:
* subversion/libsvn_wc/conflicts.h
(svn_wc__conflict_invoke_resolver): Improve the doc string.
* subversion/libsvn_wc/props.h
(svn_wc__merge_props): Improve the doc string.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.h
subversion/trunk/subversion/libsvn_wc/props.h
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1438690&r1=1438689&r2=1438690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Fri Jan 25 20:35:11 2013
@@ -381,7 +381,11 @@ svn_wc__conflict_create_markers(svn_skel
/* Call the interactive conflict resolver RESOLVER_FUNC with RESOLVER_BATON to
allow resolving the conflicts on LOCAL_ABSPATH.
+ Call RESOLVER_FUNC once for each property conflict, and again for any
+ text conflict, and again for any tree conflict on the node.
+
CONFLICT_SKEL contains the details of the conflicts on LOCAL_ABSPATH.
+
Resolver actions are directly applied to the in-db state of LOCAL_ABSPATH,
so the conflict and the state in CONFLICT_SKEL must already be installed in
wc.db. */
Modified: subversion/trunk/subversion/libsvn_wc/props.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.h?rev=1438690&r1=1438689&r2=1438690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.h (original)
+++ subversion/trunk/subversion/libsvn_wc/props.h Fri Jan 25 20:35:11 2013
@@ -98,7 +98,13 @@ svn_wc__canonicalize_props(apr_hash_t **
CONFLICT_SKEL itself must not be NULL.)
If STATE is non-null, set *STATE to the state of the local properties
- after the merge. */
+ after the merge, one of:
+
+ svn_wc_notify_state_unchanged
+ svn_wc_notify_state_changed
+ svn_wc_notify_state_merged
+ svn_wc_notify_state_conflicted
+ */
svn_error_t *
svn_wc__merge_props(svn_skel_t **conflict_skel,
svn_wc_notify_state_t *state,
