diff options
Diffstat (limited to 'subversion/libsvn_wc/conflicts.h')
| -rw-r--r-- | subversion/libsvn_wc/conflicts.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/subversion/libsvn_wc/conflicts.h b/subversion/libsvn_wc/conflicts.h index d4730653189b..839e8a0d4eb0 100644 --- a/subversion/libsvn_wc/conflicts.h +++ b/subversion/libsvn_wc/conflicts.h @@ -401,14 +401,18 @@ svn_wc__conflict_create_markers(svn_skel_t **work_item, apr_pool_t *result_pool, apr_pool_t *scratch_pool); -/* Call the interactive conflict resolver RESOLVER_FUNC with RESOLVER_BATON to - allow resolving the conflicts on LOCAL_ABSPATH. +/* Call the conflict resolver RESOLVER_FUNC with RESOLVER_BATON for each + of the conflicts on LOCAL_ABSPATH. Depending on the results that + the callback returns, perhaps resolve the conflicts, and perhaps mark + them as resolved in the WC DB. 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. + Use MERGE_OPTIONS when the resolver requests a merge. + 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. */ |