Searched defs:conflict_skel (Results 1 - 9 of 9) sorted by relevance

/freebsd-10.1-release/contrib/subversion/subversion/libsvn_wc/
H A Dtree_conflicts.c408 svn_skel_t *conflict_skel; local
H A Dmerge.c808 merge_text_file(svn_skel_t **work_items, svn_skel_t **conflict_skel, enum svn_wc_merge_outcome_t *merge_outcome, const merge_target_t *mt, const char *left_abspath, const char *right_abspath, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *detranslated_target_abspath, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
982 merge_binary_file(svn_skel_t **work_items, svn_skel_t **conflict_skel, enum svn_wc_merge_outcome_t *merge_outcome, const merge_target_t *mt, const char *left_abspath, const char *right_abspath, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *detranslated_target_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1074 svn_wc__internal_merge(svn_skel_t **work_items, svn_skel_t **conflict_skel, enum svn_wc_merge_outcome_t *merge_outcome, svn_wc__db_t *db, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *wri_abspath, const char *left_label, const char *right_label, const char *target_label, apr_hash_t *old_actual_props, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1225 svn_skel_t *conflict_skel = NULL; local
[all...]
H A Dworkqueue.c1170 svn_wc__wq_build_prej_install(svn_skel_t **work_item, svn_wc__db_t *db, const char *local_abspath, svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
H A Dconflicts.c64 svn_skel_t *conflict_skel = svn_skel__make_empty_list(result_pool); local
67 svn_skel__prepend(svn_skel__make_empty_list(result_pool), conflict_skel); local
70 svn_skel__prepend(svn_skel__make_empty_list(result_pool), conflict_skel); local
76 svn_wc__conflict_skel_is_complete(svn_boolean_t *complete, const svn_skel_t *conflict_skel) argument
193 conflict__get_operation(svn_skel_t **why, const svn_skel_t *conflict_skel) argument
211 svn_wc__conflict_skel_set_op_update(svn_skel_t *conflict_skel, const svn_wc_conflict_version_t *original, const svn_wc_conflict_version_t *target, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
245 svn_wc__conflict_skel_set_op_switch(svn_skel_t *conflict_skel, const svn_wc_conflict_version_t *original, const svn_wc_conflict_version_t *target, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
279 svn_wc__conflict_skel_set_op_merge(svn_skel_t *conflict_skel, const svn_wc_conflict_version_t *left, const svn_wc_conflict_version_t *right, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
316 conflict__get_conflict(svn_skel_t **conflict, const svn_skel_t *conflict_skel, const char *conflict_type) argument
344 svn_wc__conflict_skel_add_text_conflict(svn_skel_t *conflict_skel, svn_wc__db_t *db, const char *wri_abspath, const char *mine_abspath, const char *their_old_abspath, const char *their_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
415 svn_wc__conflict_skel_add_prop_conflict(svn_skel_t *conflict_skel, svn_wc__db_t *db, const char *wri_abspath, const char *marker_abspath, const apr_hash_t *mine_props, const apr_hash_t *their_old_props, const apr_hash_t *their_props, const apr_hash_t *conflicted_prop_names, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
536 svn_wc__conflict_skel_add_tree_conflict(svn_skel_t *conflict_skel, svn_wc__db_t *db, const char *wri_abspath, svn_wc_conflict_reason_t local_change, svn_wc_conflict_action_t incoming_change, const char *move_src_op_root_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
594 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
689 svn_wc__conflict_read_info(svn_wc_operation_t *operation, const apr_array_header_t **locations, svn_boolean_t *text_conflicted, svn_boolean_t *prop_conflicted, svn_boolean_t *tree_conflicted, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
772 svn_wc__conflict_read_text_conflict(const char **mine_abspath, const char **their_old_abspath, const char **their_abspath, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
843 svn_wc__conflict_read_prop_conflict(const char **marker_abspath, apr_hash_t **mine_props, apr_hash_t **their_old_props, apr_hash_t **their_props, apr_hash_t **conflicted_prop_names, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
934 svn_wc__conflict_read_tree_conflict(svn_wc_conflict_reason_t *local_change, svn_wc_conflict_action_t *incoming_change, const char **move_src_op_root_abspath, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1007 svn_wc__conflict_read_markers(const apr_array_header_t **markers, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1117 svn_wc__conflict_create_markers(svn_skel_t **work_items, svn_wc__db_t *db, const char *local_abspath, svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1862 svn_wc__conflict_invoke_resolver(svn_wc__db_t *db, const char *local_abspath, const svn_skel_t *conflict_skel, const apr_array_header_t *merge_options, svn_wc_conflict_resolver_func2_t resolver_func, void *resolver_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
2056 read_prop_conflicts(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
2218 svn_skel_t *conflict_skel; local
[all...]
H A Dexternals.c669 svn_skel_t *conflict_skel = NULL; local
H A Dprops.c207 svn_skel_t *conflict_skel = NULL; local
676 svn_wc__create_prejfile(const char **tmp_prejfile_abspath, svn_wc__db_t *db, const char *local_abspath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1113 svn_wc__merge_props(svn_skel_t **conflict_skel, svn_wc_notify_state_t *state, apr_hash_t **new_actual_props, svn_wc__db_t *db, const char *local_abspath, apr_hash_t *server_baseprops, apr_hash_t *pristine_props, apr_hash_t *actual_props, const apr_array_header_t *propchanges, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
H A Dwc_db_update_move.c833 svn_skel_t *conflict_skel = NULL; local
663 create_conflict_markers(svn_skel_t **work_items, const char *local_abspath, svn_wc__db_t *db, const char *repos_relpath, svn_skel_t *conflict_skel, svn_wc_operation_t operation, const working_node_version_t *old_version, const working_node_version_t *new_version, svn_node_kind_t kind, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
719 update_working_props(svn_wc_notify_state_t *prop_state, svn_skel_t **conflict_skel, apr_array_header_t **propchanges, apr_hash_t **actual_props, svn_wc__db_t *db, const char *local_abspath, const struct working_node_version_t *old_version, const struct working_node_version_t *new_version, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
900 svn_skel_t *conflict_skel = NULL; local
1374 svn_skel_t *conflict_skel; local
[all...]
H A Dupdate_editor.c2551 svn_skel_t *conflict_skel = NULL; local
3892 svn_wc__perform_file_merge(svn_skel_t **work_items, svn_skel_t **conflict_skel, svn_boolean_t *found_conflict, svn_wc__db_t *db, const char *local_abspath, const char *wri_abspath, const svn_checksum_t *new_checksum, const svn_checksum_t *original_checksum, apr_hash_t *old_actual_props, const apr_array_header_t *ext_patterns, svn_revnum_t old_revision, svn_revnum_t target_revision, const apr_array_header_t *propchanges, const char *diff3_cmd, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
4026 merge_file(svn_skel_t **work_items, svn_skel_t **conflict_skel, svn_boolean_t *install_pristine, const char **install_from, svn_wc_notify_state_t *content_state, struct file_baton *fb, apr_hash_t *actual_props, apr_time_t last_changed_date, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
4251 svn_skel_t *conflict_skel = NULL; local
[all...]
H A Dwc_db.c6203 svn_wc__db_mark_conflict_internal(svn_wc__db_wcroot_t *wcroot, const char *local_relpath, const svn_skel_t *conflict_skel, apr_pool_t *scratch_pool) argument
6250 svn_wc__db_op_mark_conflict(svn_wc__db_t *db, const char *local_abspath, const svn_skel_t *conflict_skel, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument

Completed in 272 milliseconds