H A D | conflicts.c | 2 * conflicts.c: conflict resolver implementation 58 /* Describe a tree conflict. */ 61 svn_client_conflict_t *conflict, 66 /* Get more information about a tree conflict. 69 svn_client_conflict_t *conflict, 78 /* Indicate which options were chosen to resolve a text or tree conflict 89 /* Ask a tree conflict to describe itself. */ 95 /* Ask a tree conflict to find out more information about itself 101 * when describing a tree conflict. */ 105 /* The pool this conflict wa 132 svn_client_conflict_t *conflict; member in struct:svn_client_conflict_option_t 199 add_legacy_desc_to_conflict(const svn_wc_conflict_description2_t *desc, svn_client_conflict_t *conflict, apr_pool_t *result_pool) argument 1114 describe_local_file_node_change(const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 1338 describe_local_dir_node_change(const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 2215 find_revision_for_suspected_deletion(svn_revnum_t *deleted_rev, const char **deleted_rev_author, svn_node_kind_t *replacing_node_kind, struct apr_array_header_t **moves, svn_client_conflict_t *conflict, const char *deleted_basename, const char *parent_repos_relpath, svn_revnum_t start_rev, svn_revnum_t end_rev, const char *related_repos_relpath, svn_revnum_t related_peg_rev, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 2408 find_related_node(const char **related_repos_relpath, svn_revnum_t *related_peg_rev, const char *younger_related_repos_relpath, svn_revnum_t younger_related_peg_rev, const char *older_repos_relpath, svn_revnum_t older_peg_rev, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 2787 conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 3102 describe_local_none_node_change(const char **description, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 3195 conflict_tree_get_local_description_generic(const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 3230 conflict_tree_get_description_local_missing(const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 3498 svn_client_conflict_prop_get_description(const char **description, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 3560 conflict_tree_get_incoming_description_generic( const char **incoming_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 4780 conflict_tree_get_description_incoming_delete( const char **incoming_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 5003 init_wc_move_targets(struct conflict_tree_incoming_delete_details *details, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 5083 conflict_tree_get_details_incoming_delete(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 5280 conflict_tree_get_details_incoming_add(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 5763 conflict_tree_get_description_incoming_add( const char **incoming_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 5962 conflict_tree_get_details_incoming_edit(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6205 conflict_tree_get_description_incoming_edit( const char **incoming_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 6362 svn_client_conflict_tree_get_description( const char **incoming_change_description, const char **local_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 6392 resolve_postpone(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6402 resolve_text_conflict(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6441 resolve_prop_conflict(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6519 resolve_accept_current_wc_state(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6566 resolve_update_break_moved_away(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6599 resolve_update_raise_moved_away(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6632 resolve_update_moved_away_node(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6672 verify_local_state_for_incoming_add_upon_update( svn_client_conflict_t *conflict, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6814 resolve_incoming_add_ignore(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 6883 resolve_merge_incoming_added_file_text_update( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 7025 resolve_merge_incoming_added_file_text_merge( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 7154 resolve_merge_incoming_added_file_replace_and_merge( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 7363 svn_wc_conflict_description2_t *conflict; local 7820 resolve_merge_incoming_added_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 7930 resolve_update_incoming_added_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 7992 merge_incoming_added_dir_replace(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, svn_boolean_t merge_dirs, apr_pool_t *scratch_pool) argument 8148 resolve_merge_incoming_added_dir_replace(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 8162 resolve_merge_incoming_added_dir_replace_and_merge( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 8178 ensure_local_edit_vs_incoming_deletion_copied_state( struct conflict_tree_incoming_delete_details *details, svn_wc_operation_t operation, const char *wcroot_abspath, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 8289 verify_local_state_for_incoming_delete(svn_client_conflict_t *conflict, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 8364 resolve_incoming_delete_ignore(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 8410 resolve_incoming_delete_accept(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 8479 resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 8812 resolve_both_moved_file_text_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 9016 resolve_both_moved_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 9165 resolve_both_moved_dir_move_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 9324 resolve_incoming_move_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 9558 resolve_local_move_file_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 9738 resolve_local_move_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 9858 assert_text_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument 9872 assert_prop_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument 9887 assert_tree_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument 9905 add_resolution_option(apr_array_header_t *options, svn_client_conflict_t *conflict, svn_client_conflict_option_id_t id, const char *label, const char *description, conflict_option_resolve_func_t resolve_func) argument 9928 svn_client_conflict_text_get_resolution_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 10013 svn_client_conflict_prop_get_resolution_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 10071 configure_option_accept_current_wc_state(svn_client_conflict_t *conflict, apr_array_header_t *options) argument 10110 configure_option_update_move_destination(svn_client_conflict_t *conflict, apr_array_header_t *options) argument 10140 configure_option_update_raise_moved_away_children( svn_client_conflict_t *conflict, apr_array_header_t *options) argument 10174 configure_option_incoming_add_ignore(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10247 configure_option_incoming_added_file_text_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10315 configure_option_incoming_added_file_replace_and_merge( svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10372 configure_option_incoming_added_dir_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10445 configure_option_incoming_added_dir_replace(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10499 configure_option_incoming_added_dir_replace_and_merge( svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10555 configure_option_incoming_delete_ignore(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10630 configure_option_incoming_delete_accept(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10691 describe_incoming_move_merge_conflict_option( const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, const char *moved_to_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 10781 configure_option_incoming_move_file_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10850 configure_option_incoming_dir_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 10918 configure_option_local_move_file_or_dir_merge( svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 11005 configure_option_sibling_move_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 11110 resolve_both_moved_file_update_keep_local_move( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 11320 resolve_both_moved_file_update_keep_incoming_move( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 11523 conflict_tree_get_details_update_local_moved_away( svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 11556 get_both_moved_file_paths(const char **incoming_moved_to_abspath, const char **local_moved_to_abspath, svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument 11618 conflict_tree_get_description_update_both_moved_file_merge( const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 11678 conflict_tree_get_description_update_both_moved_file_move_merge( const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 11730 configure_option_both_moved_file_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 11809 configure_option_both_moved_dir_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument 11947 svn_client_conflict_t *conflict = option->conflict; local 12093 svn_client_conflict_t *conflict = option->conflict; local 12206 svn_client_conflict_t *conflict = option->conflict; local 12375 svn_client_conflict_t *conflict = option->conflict; local 12582 svn_client_conflict_tree_get_resolution_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 12664 svn_client_conflict_tree_get_details(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 12731 svn_client_conflict_get_recommended_option_id(svn_client_conflict_t *conflict) argument 12737 svn_client_conflict_text_resolve(svn_client_conflict_t *conflict, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 12770 svn_client_conflict_text_resolve_by_id( svn_client_conflict_t *conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 12798 svn_client_conflict_text_get_resolution(svn_client_conflict_t *conflict) argument 12804 svn_client_conflict_prop_resolve(svn_client_conflict_t *conflict, const char *propname, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 12818 svn_client_conflict_prop_resolve_by_id( svn_client_conflict_t *conflict, const char *propname, svn_client_conflict_option_id_t option_id, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 12847 svn_client_conflict_prop_get_resolution(svn_client_conflict_t *conflict, const char *propname) argument 12860 svn_client_conflict_tree_resolve(svn_client_conflict_t *conflict, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 12872 svn_client_conflict_tree_resolve_by_id( svn_client_conflict_t *conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 12899 svn_client_conflict_tree_get_resolution(svn_client_conflict_t *conflict) argument 12906 get_conflict_desc2_t(svn_client_conflict_t *conflict) argument 12922 svn_client_conflict_get_conflicted(svn_boolean_t *text_conflicted, apr_array_header_t **props_conflicted, svn_boolean_t *tree_conflicted, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 12949 svn_client_conflict_get_local_abspath(svn_client_conflict_t *conflict) argument 12955 svn_client_conflict_get_operation(svn_client_conflict_t *conflict) argument 12961 svn_client_conflict_get_incoming_change(svn_client_conflict_t *conflict) argument 12967 svn_client_conflict_get_local_change(svn_client_conflict_t *conflict) argument 12973 svn_client_conflict_get_repos_info(const char **repos_root_url, const char **repos_uuid, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 13007 svn_client_conflict_get_incoming_old_repos_location( const char **incoming_old_repos_relpath, svn_revnum_t *incoming_old_pegrev, svn_node_kind_t *incoming_old_node_kind, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 13046 svn_client_conflict_get_incoming_new_repos_location( const char **incoming_new_repos_relpath, svn_revnum_t *incoming_new_pegrev, svn_node_kind_t *incoming_new_node_kind, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 13085 svn_client_conflict_tree_get_victim_node_kind(svn_client_conflict_t *conflict) argument 13094 svn_client_conflict_prop_get_propvals(const svn_string_t **base_propval, const svn_string_t **working_propval, const svn_string_t **incoming_old_propval, const svn_string_t **incoming_new_propval, svn_client_conflict_t *conflict, const char *propname, apr_pool_t *result_pool) argument 13131 svn_client_conflict_prop_get_reject_abspath(svn_client_conflict_t *conflict) argument 13141 svn_client_conflict_text_get_mime_type(svn_client_conflict_t *conflict) argument 13150 svn_client_conflict_text_get_contents(const char **base_abspath, const char **working_abspath, const char **incoming_old_abspath, const char **incoming_new_abspath, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 13183 conflict_type_specific_setup(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument 13250 svn_client_conflict_get(svn_client_conflict_t **conflict, const char *local_abspath, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 13365 svn_client_conflict_t *conflict; local [all...] |