Home
last modified time | relevance | path

Searched refs:svn_wc_conflict_reason_added (Results 1 – 8 of 8) sorted by relevance

/freebsd-13-stable/contrib/subversion/subversion/svn/
HDcl-conflicts.c53 { "add", svn_wc_conflict_reason_added },
86 case svn_wc_conflict_reason_added: in local_reason_str()
112 case svn_wc_conflict_reason_added: in local_reason_str()
139 case svn_wc_conflict_reason_added: in local_reason_str()
236 case svn_wc_conflict_reason_added: in svn_cl__get_human_readable_prop_conflict_description()
/freebsd-13-stable/contrib/subversion/subversion/libsvn_wc/
HDtree_conflicts.c80 { "added", svn_wc_conflict_reason_added },
HDwc_db_update_move.c754 reason = svn_wc_conflict_reason_added; in tc_editor_add_directory()
943 reason = svn_wc_conflict_reason_added; in tc_editor_add_file()
2986 svn_wc_conflict_reason_added, in tc_editor_update_add_new_file()
3032 svn_wc_conflict_reason_added, in tc_editor_update_add_new_directory()
HDconflicts.c519 { "added", svn_wc_conflict_reason_added },
2210 desc->reason = svn_wc_conflict_reason_added; in read_prop_conflict_descs()
3852 if (local_change != svn_wc_conflict_reason_added) in svn_wc__conflict_tree_update_local_add()
HDupdate_editor.c1385 reason = svn_wc_conflict_reason_added; in check_tree_conflict()
1514 else if (reason == svn_wc_conflict_reason_added || in check_tree_conflict()
/freebsd-13-stable/contrib/subversion/subversion/libsvn_client/
HDconflicts.c242 { "add", svn_wc_conflict_reason_added },
1162 case svn_wc_conflict_reason_added: in describe_local_file_node_change()
1387 case svn_wc_conflict_reason_added: in describe_local_dir_node_change()
3144 case svn_wc_conflict_reason_added: in describe_local_none_node_change()
3512 case svn_wc_conflict_reason_added: in svn_client_conflict_prop_get_description()
10199 local_change == svn_wc_conflict_reason_added)) in configure_option_incoming_add_ignore()
10274 local_change == svn_wc_conflict_reason_added)) in configure_option_incoming_added_file_text_merge()
10397 (local_change == svn_wc_conflict_reason_added || in configure_option_incoming_added_dir_merge()
HDmerge.c1353 else if (reason == svn_wc_conflict_reason_added) in record_tree_conflict()
1892 fb->tree_conflict_reason = added ? svn_wc_conflict_reason_added in merge_file_opened()
2000 fb->tree_conflict_reason = added ? svn_wc_conflict_reason_added in merge_file_opened()
2704 db->tree_conflict_reason = added ? svn_wc_conflict_reason_added in merge_dir_opened()
2854 db->tree_conflict_reason = added ? svn_wc_conflict_reason_added in merge_dir_opened()
/freebsd-13-stable/contrib/subversion/subversion/include/
HDsvn_wc.h1650 svn_wc_conflict_reason_added, enumerator