Searched refs:conflict_func (Results 1 - 11 of 11) sorted by relevance

/freebsd-10.0-release/contrib/subversion/subversion/libsvn_client/
H A Dctx.c63 if (ctx->conflict_func)
68 SVN_ERR(ctx->conflict_func(result, cd, ctx->conflict_baton,
/freebsd-10.0-release/contrib/subversion/subversion/include/private/
H A Dsvn_wc_private.h85 svn_wc_conflict_resolver_func2_t conflict_func,
1399 * If @a conflict_func is non-NULL, then invoke it with @a
1490 svn_wc_conflict_resolver_func2_t conflict_func,
1532 svn_wc_conflict_resolver_func2_t conflict_func,
1721 * @a conflict_func with the @a conflict_baton argument to obtain a
1757 svn_wc_conflict_resolver_func2_t conflict_func,
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_wc/
H A Ddeprecated.c2503 svn_wc_conflict_resolver_func_t conflict_func,
2519 conflict_wrapper.inner_func = conflict_func;
2534 conflict_func ? conflict_func_1to2_wrapper
3331 svn_wc_conflict_resolver_func2_t conflict_func,
3357 conflict_func, conflict_baton,
3377 svn_wc_conflict_resolver_func_t conflict_func,
3404 if (conflict_func)
3407 cfw->inner_func = conflict_func;
3428 conflict_func ? conflict_func_1to2_wrapper
3517 svn_wc_conflict_resolver_func2_t conflict_func,
2495 svn_wc_merge_props2(svn_wc_notify_state_t *state, const char *path, svn_wc_adm_access_t *adm_access, apr_hash_t *baseprops, const apr_array_header_t *propchanges, svn_boolean_t base_merge, svn_boolean_t dry_run, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, apr_pool_t *scratch_pool) argument
3313 svn_wc_get_update_editor4(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t server_performs_filtering, svn_boolean_t clean_checkout, const char *diff3_cmd, const apr_array_header_t *preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3365 svn_wc_get_update_editor3(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, svn_wc_get_file_t fetch_func, void *fetch_baton, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool) argument
3500 svn_wc_get_switch_editor4(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, const char *switch_url, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t server_performs_filtering, const char *diff3_cmd, const apr_array_header_t *preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3549 svn_wc_get_switch_editor3(svn_revnum_t *target_revision, svn_wc_adm_access_t *anchor, const char *target, const char *switch_url, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const svn_delta_editor_t **editor, void **edit_baton, svn_wc_traversal_info_t *traversal_info, apr_pool_t *pool) argument
4264 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome, svn_wc_context_t *wc_ctx, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *left_label, const char *right_label, const char *target_label, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
4307 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, apr_pool_t *pool) argument
[all...]
H A Dupdate_editor.c246 svn_wc_conflict_resolver_func2_t conflict_func;
1949 if (eb->conflict_func)
1953 eb->conflict_func,
2309 if (eb->conflict_func)
2313 eb->conflict_func,
2930 if (conflict_skel && eb->conflict_func)
2934 eb->conflict_func,
3410 if (eb->conflict_func)
3414 eb->conflict_func,
4584 if (conflict_skel && eb->conflict_func)
243 svn_wc_conflict_resolver_func2_t conflict_func; member in struct:edit_baton
4772 make_editor(svn_revnum_t *target_revision, svn_wc__db_t *db, const char *anchor_abspath, const char *target_basename, apr_hash_t *wcroot_iprops, svn_boolean_t use_commit_times, const char *switch_url, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t server_performs_filtering, svn_boolean_t clean_checkout, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const svn_delta_editor_t **editor, void **edit_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
5057 svn_wc__get_update_editor(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, apr_hash_t *wcroot_iprops, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t adds_as_modification, svn_boolean_t server_performs_filtering, svn_boolean_t clean_checkout, const char *diff3_cmd, const apr_array_header_t *preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
5101 svn_wc__get_switch_editor(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *anchor_abspath, const char *target_basename, const char *switch_url, apr_hash_t *wcroot_iprops, svn_boolean_t use_commit_times, svn_depth_t depth, svn_boolean_t depth_is_sticky, svn_boolean_t allow_unver_obstructions, svn_boolean_t server_performs_filtering, const char *diff3_cmd, const apr_array_header_t *preserved_exts, svn_wc_dirents_func_t fetch_dirents_func, void *fetch_dirents_baton, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_wc_external_update_t external_func, void *external_baton, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
H A Dconflicts.c1276 svn_wc_conflict_resolver_func2_t conflict_func,
1432 SVN_ERR(conflict_func(&result, cdesc, conflict_baton, scratch_pool,
1756 svn_wc_conflict_resolver_func2_t conflict_func,
1787 SVN_ERR(conflict_func(&result, cdesc, conflict_baton, scratch_pool,
2877 svn_wc_conflict_resolver_func2_t conflict_func;
2924 if (!cswb->conflict_func)
2929 SVN_ERR(cswb->conflict_func(&result, cd, cswb->conflict_baton,
3027 svn_wc_conflict_resolver_func2_t conflict_func,
3068 cswb.conflict_func = conflict_func;
1264 generate_propconflict(svn_boolean_t *conflict_remains, svn_wc__db_t *db, const char *local_abspath, svn_wc_operation_t operation, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, const char *propname, const svn_string_t *base_val, const svn_string_t *working_val, const svn_string_t *incoming_old_val, const svn_string_t *incoming_new_val, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, apr_pool_t *scratch_pool) argument
1743 resolve_text_conflict(svn_skel_t **work_items, svn_boolean_t *was_resolved, svn_wc__db_t *db, const char *local_abspath, const apr_array_header_t *merge_options, svn_wc_operation_t operation, const char *left_abspath, const char *right_abspath, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, const char *result_target, const char *detranslated_target, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2875 svn_wc_conflict_resolver_func2_t conflict_func; member in struct:conflict_status_walker_baton
3018 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
[all...]
H A Dexternals.c422 svn_wc_conflict_resolver_func2_t conflict_func;
995 svn_wc_conflict_resolver_func2_t conflict_func,
1045 eb->conflict_func = conflict_func;
420 svn_wc_conflict_resolver_func2_t conflict_func; member in struct:edit_baton
976 svn_wc__get_file_external_editor(const svn_delta_editor_t **editor, void **edit_baton, svn_revnum_t *target_revision, svn_wc_context_t *wc_ctx, const char *local_abspath, const char *wri_abspath, const char *url, const char *repos_root_url, const char *repos_uuid, apr_array_header_t *iprops, svn_boolean_t use_commit_times, const char *diff3_cmd, const apr_array_header_t *preserved_exts, const char *record_ancestor_abspath, const char *recorded_url, const svn_opt_revision_t *recorded_peg_rev, const svn_opt_revision_t *recorded_rev, 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 *result_pool, apr_pool_t *scratch_pool) argument
H A Dmerge.c1218 svn_wc_conflict_resolver_func2_t conflict_func,
1400 if (conflict_skel && conflict_func)
1407 conflict_func, conflict_baton,
1201 svn_wc_merge5(enum svn_wc_merge_outcome_t *merge_content_outcome, enum svn_wc_notify_state_t *merge_props_outcome, svn_wc_context_t *wc_ctx, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *left_label, const char *right_label, const char *target_label, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, apr_hash_t *original_props, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
H A Dprops.c193 svn_wc_conflict_resolver_func2_t conflict_func,
353 if (conflict_skel && conflict_func)
359 conflict_func, conflict_baton,
183 svn_wc_merge_props3(svn_wc_notify_state_t *state, svn_wc_context_t *wc_ctx, const char *local_abspath, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, apr_hash_t *baseprops, const apr_array_header_t *propchanges, svn_boolean_t dry_run, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
/freebsd-10.0-release/contrib/subversion/subversion/include/
H A Dsvn_wc.h5639 * If @a conflict_func is non-NULL, then invoke it with @a
5722 svn_wc_conflict_resolver_func2_t conflict_func,
5771 svn_wc_conflict_resolver_func_t conflict_func,
5786 * conflict_func and baton set to NULL, @a fetch_func and baton set to
5868 svn_wc_conflict_resolver_func2_t conflict_func,
5914 svn_wc_conflict_resolver_func_t conflict_func,
5926 * @a preserved_exts set to NULL, @a conflict_func and baton set to NULL,
6791 * @a dry_run, @a conflict_func and @a conflict_baton. Return the
6796 * conflict_func with @a conflict_baton (if non-NULL). If the
6860 svn_wc_conflict_resolver_func2_t conflict_func,
[all...]
H A Dsvn_client.h990 svn_wc_conflict_resolver_func_t conflict_func;
998 * subversion should try @c conflict_func.
989 svn_wc_conflict_resolver_func_t conflict_func; member in struct:svn_client_ctx_t
/freebsd-10.0-release/contrib/subversion/subversion/svn/
H A Dsvn.c2868 ctx->conflict_func = NULL;

Completed in 244 milliseconds