H A D | conflicts.c | 613 svn_boolean_t resolve_text, 636 if (resolve_text 2975 svn_boolean_t resolve_text; 3060 || (cd->kind == svn_wc_conflict_kind_text && !cswb->resolve_text) 3168 if (cswb->resolve_text && cswb->resolve_tree && 3202 svn_boolean_t resolve_text, 3222 cswb.resolve_text = resolve_text; 3360 svn_boolean_t resolve_text, 3371 depth, resolve_text, 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 2973 svn_boolean_t resolve_text; 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...] |