| /freebsd-11.0-release/contrib/subversion/subversion/libsvn_wc/ |
| H A D | merge.c | 1205 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 D | conflicts.c | 1142 generate_propconflict(svn_boolean_t *conflict_remains, svn_wc__db_t *db, const char *local_abspath, svn_node_kind_t kind, 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, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
1732 read_text_conflict_desc(svn_wc_conflict_description2_t **desc, svn_wc__db_t *db, const char *local_abspath, const svn_skel_t *conflict_skel, const char *mime_type, svn_wc_operation_t operation, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1771 read_tree_conflict_desc(svn_wc_conflict_description2_t **desc, svn_wc__db_t *db, const char *local_abspath, svn_node_kind_t node_kind, const svn_skel_t *conflict_skel, svn_wc_operation_t operation, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1849 const svn_wc_conflict_version_t *left_version = NULL; local
2051 read_prop_conflict_descs(apr_array_header_t *conflicts, svn_wc__db_t *db, const char *local_abspath, svn_skel_t *conflict_skel, svn_boolean_t create_tempfiles, svn_node_kind_t node_kind, svn_wc_operation_t operation, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2251 const svn_wc_conflict_version_t *left_version = NULL; local
[all...] |
| H A D | props.c | 158 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
|
| H A D | wc_db_update_move.c | 2443 svn_wc_conflict_version_t *left_version, *right_version; local
2277 fetch_conflict_details(int *src_op_depth, svn_wc_operation_t *operation, svn_wc_conflict_action_t *action, svn_wc_conflict_version_t **left_version, svn_wc_conflict_version_t **right_version, svn_wc__db_wcroot_t *wcroot, svn_wc__db_t *db, const char *local_relpath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
|
| H A D | deprecated.c | 4502 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
|