| /freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/ |
| D | conflicts.h | 74 const svn_skel_t *conflict_skel);
88 svn_wc__conflict_skel_set_op_update(svn_skel_t *conflict_skel,
105 svn_wc__conflict_skel_set_op_switch(svn_skel_t *conflict_skel,
123 svn_wc__conflict_skel_set_op_merge(svn_skel_t *conflict_skel,
150 svn_wc__conflict_skel_add_text_conflict(svn_skel_t *conflict_skel,
191 svn_wc__conflict_skel_add_prop_conflict(svn_skel_t *conflict_skel,
230 svn_wc__conflict_skel_add_tree_conflict(svn_skel_t *conflict_skel,
267 svn_skel_t *conflict_skel,
309 const svn_skel_t *conflict_skel,
329 const svn_skel_t *conflict_skel,
[all …]
|
| D | conflicts.c | 64 svn_skel_t *conflict_skel = svn_skel__make_empty_list(result_pool); in svn_wc__conflict_skel_create() local
67 svn_skel__prepend(svn_skel__make_empty_list(result_pool), conflict_skel); in svn_wc__conflict_skel_create()
70 svn_skel__prepend(svn_skel__make_empty_list(result_pool), conflict_skel); in svn_wc__conflict_skel_create()
72 return conflict_skel; in svn_wc__conflict_skel_create()
77 const svn_skel_t *conflict_skel) in svn_wc__conflict_skel_is_complete() argument
81 if (svn_skel__list_length(conflict_skel) < 2) in svn_wc__conflict_skel_is_complete()
85 if (svn_skel__list_length(conflict_skel->children) < 2) in svn_wc__conflict_skel_is_complete()
88 if (svn_skel__list_length(conflict_skel->children->next) == 0) in svn_wc__conflict_skel_is_complete()
194 const svn_skel_t *conflict_skel) in conflict__get_operation() argument
196 SVN_ERR_ASSERT(conflict_skel in conflict__get_operation()
[all …]
|
| D | merge.c | 817 svn_skel_t **conflict_skel, in merge_text_file() argument
904 if (!*conflict_skel) in merge_text_file()
905 *conflict_skel = svn_wc__conflict_skel_create(result_pool); in merge_text_file()
907 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(*conflict_skel, in merge_text_file()
987 svn_skel_t **conflict_skel, in merge_binary_file() argument
1062 if (!*conflict_skel) in merge_binary_file()
1063 *conflict_skel = svn_wc__conflict_skel_create(result_pool); in merge_binary_file()
1065 SVN_ERR(svn_wc__conflict_skel_add_text_conflict(*conflict_skel, in merge_binary_file()
1079 svn_skel_t **conflict_skel, in svn_wc__internal_merge() argument
1159 conflict_skel, in svn_wc__internal_merge()
[all …]
|
| D | tree_conflicts.c | 411 svn_skel_t *conflict_skel; in svn_wc__add_tree_conflict() local
439 conflict_skel = svn_wc__conflict_skel_create(scratch_pool); in svn_wc__add_tree_conflict()
441 SVN_ERR(svn_wc__conflict_skel_add_tree_conflict(conflict_skel, wc_ctx->db, in svn_wc__add_tree_conflict()
452 SVN_ERR(svn_wc__conflict_skel_set_op_update(conflict_skel, in svn_wc__add_tree_conflict()
458 SVN_ERR(svn_wc__conflict_skel_set_op_switch(conflict_skel, in svn_wc__add_tree_conflict()
464 SVN_ERR(svn_wc__conflict_skel_set_op_merge(conflict_skel, in svn_wc__add_tree_conflict()
473 conflict_skel, NULL, scratch_pool)); in svn_wc__add_tree_conflict()
|
| D | wc_db_update_move.c | 841 svn_skel_t *conflict_skel, in create_conflict_markers() argument
872 conflict_skel, original_version, in create_conflict_markers()
879 conflict_skel, original_version, in create_conflict_markers()
889 conflict_skel, in create_conflict_markers()
898 svn_skel_t **conflict_skel, in update_working_props() argument
922 SVN_ERR(svn_wc__merge_props(conflict_skel, prop_state, in update_working_props()
961 svn_skel_t *conflict_skel = NULL; in tc_editor_alter_directory() local
977 SVN_ERR(create_node_tree_conflict(&conflict_skel, nmb, dst_relpath, in tc_editor_alter_directory()
994 SVN_ERR(update_working_props(&prop_state, &conflict_skel, in tc_editor_alter_directory()
1014 conflict_skel, b->operation, in tc_editor_alter_directory()
[all …]
|
| D | wc.h | 402 svn_skel_t **conflict_skel,
638 svn_skel_t **conflict_skel,
662 svn_skel_t **conflict_skel,
|
| D | props.c | 182 svn_skel_t *conflict_skel = NULL; in svn_wc_merge_props3() local
269 SVN_ERR(svn_wc__merge_props(&conflict_skel, state, in svn_wc_merge_props3()
295 if (conflict_skel) in svn_wc_merge_props3()
298 SVN_ERR(svn_wc__conflict_skel_set_op_merge(conflict_skel, in svn_wc_merge_props3()
306 conflict_skel, in svn_wc_merge_props3()
317 conflict_skel, in svn_wc_merge_props3()
326 if (conflict_skel && conflict_func) in svn_wc_merge_props3()
331 conflict_skel, in svn_wc_merge_props3()
1220 svn_wc__merge_props(svn_skel_t **conflict_skel, in svn_wc__merge_props() argument
1334 if (!*conflict_skel) in svn_wc__merge_props()
[all …]
|
| D | update_editor.c | 2429 svn_skel_t *conflict_skel = NULL; in close_directory() local
2441 conflict_skel = db->edit_conflict; in close_directory()
2561 SVN_ERR_W(svn_wc__merge_props(&conflict_skel, in close_directory()
2747 if (conflict_skel) in close_directory()
2751 SVN_ERR(complete_conflict(conflict_skel, in close_directory()
2768 conflict_skel, in close_directory()
2806 conflict_skel, all_work_items, in close_directory()
2818 if (conflict_skel && eb->conflict_func) in close_directory()
2821 conflict_skel, in close_directory()
3842 svn_skel_t **conflict_skel, in svn_wc__perform_file_merge() argument
[all …]
|
| D | externals.c | 727 svn_skel_t *conflict_skel = NULL; in close_file() local
804 SVN_ERR(svn_wc__merge_props(&conflict_skel, in close_file()
860 &conflict_skel, in close_file()
904 if (conflict_skel) in close_file()
907 conflict_skel, in close_file()
925 conflict_skel, in close_file()
953 conflict_skel, in close_file()
|
| D | props.h | 109 svn_wc__merge_props(svn_skel_t **conflict_skel,
|
| D | wc_db_private.h | 369 const svn_skel_t *conflict_skel,
|
| D | wc_db.c | 6577 const svn_skel_t *conflict_skel, in svn_wc__db_mark_conflict_internal() argument
6584 SVN_ERR(svn_wc__conflict_skel_is_complete(&is_complete, conflict_skel)); in svn_wc__db_mark_conflict_internal()
6611 svn_stringbuf_t *sb = svn_skel__unparse(conflict_skel, scratch_pool); in svn_wc__db_mark_conflict_internal()
6624 const svn_skel_t *conflict_skel, in svn_wc__db_op_mark_conflict() argument
6638 conflict_skel, scratch_pool)); in svn_wc__db_op_mark_conflict()
|