Searched refs:resolve_prop (Results 1 - 4 of 4) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.h277 const char *resolve_prop,
H A Dconflicts.c614 const char *resolve_prop,
643 else if (resolve_prop
648 if (resolve_prop[0] == '\0')
653 if (svn_skel__matches_atom(*ppropnames, resolve_prop))
2976 const char *resolve_prop;
3057 && (!cswb->resolve_prop
3058 || (*cswb->resolve_prop != '\0'
3059 && strcmp(cswb->resolve_prop, cd->property_name) != 0)))
3169 (cswb->resolve_prop == NULL || cswb->resolve_prop[
608 svn_wc__conflict_skel_resolve(svn_boolean_t *completely_resolved, svn_skel_t *conflict_skel, svn_wc__db_t *db, const char *wri_abspath, svn_boolean_t resolve_text, const char *resolve_prop, svn_boolean_t resolve_tree, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2974 const char *resolve_prop; member in struct:conflict_status_walker_baton
3197 svn_wc__resolve_conflicts(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, svn_boolean_t resolve_text, const char *resolve_prop, svn_boolean_t resolve_tree, svn_wc_conflict_choice_t conflict_choice, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool) argument
3355 svn_wc_resolved_conflict5(svn_wc_context_t *wc_ctx, const char *local_abspath, svn_depth_t depth, svn_boolean_t resolve_text, const char *resolve_prop, svn_boolean_t resolve_tree, svn_wc_conflict_choice_t conflict_choice, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool) argument
[all...]
/freebsd-11-stable/contrib/subversion/subversion/include/private/
H A Dsvn_wc_private.h1739 * If @a resolve_prop is set to "" all property conflicts are resolved,
1741 * property are resolved and when resolve_prop is NULL, no property
1792 const char *resolve_prop,
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_wc.h5049 * resolved. If @a resolve_prop is set to "" all property conflicts are
5051 * specific property are resolved and when resolve_prop is NULL, no
5107 const char *resolve_prop,

Completed in 137 milliseconds