Searched refs:resolve_text (Results 1 - 5 of 5) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.h276 svn_boolean_t resolve_text,
H A Dconflicts.c613 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...]
H A Ddeprecated.c1246 svn_boolean_t resolve_text,
1267 resolve_text,
1284 svn_boolean_t resolve_text,
1297 resolve_text, resolve_props, recurse,
1306 svn_boolean_t resolve_text,
1315 return svn_wc_resolved_conflict3(path, adm_access, resolve_text,
1326 svn_boolean_t resolve_text,
1336 return svn_wc_resolved_conflict4(path, adm_access, resolve_text,
1243 svn_wc_resolved_conflict4(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_boolean_t resolve_tree, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
1281 svn_wc_resolved_conflict(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_boolean_t recurse, svn_wc_notify_func_t notify_func, void *notify_baton, apr_pool_t *pool) argument
1303 svn_wc_resolved_conflict2(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_boolean_t recurse, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
1323 svn_wc_resolved_conflict3(const char *path, svn_wc_adm_access_t *adm_access, svn_boolean_t resolve_text, svn_boolean_t resolve_props, svn_depth_t depth, svn_wc_conflict_choice_t conflict_choice, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
/freebsd-11-stable/contrib/subversion/subversion/include/
H A Dsvn_wc.h5047 * of this state. If @a resolve_text is TRUE then any text conflict is
5106 svn_boolean_t resolve_text,
5127 svn_boolean_t resolve_text,
5150 svn_boolean_t resolve_text,
5174 svn_boolean_t resolve_text,
5193 svn_boolean_t resolve_text,
/freebsd-11-stable/contrib/subversion/subversion/include/private/
H A Dsvn_wc_private.h1737 * If @a resolve_text is TRUE then any text conflict is resolved,
1791 svn_boolean_t resolve_text,

Completed in 215 milliseconds