Home
last modified time | relevance | path

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

/freebsd-13-stable/contrib/subversion/subversion/svn/
HDcl-conflicts.c41 { "add", svn_wc_conflict_action_add },
166 case svn_wc_conflict_action_add: in incoming_action_str()
179 case svn_wc_conflict_action_add: in incoming_action_str()
193 case svn_wc_conflict_action_add: in incoming_action_str()
258 case svn_wc_conflict_action_add: in svn_cl__get_human_readable_prop_conflict_description()
307 else if (conflict_action == svn_wc_conflict_action_add || in svn_cl__get_human_readable_tree_conflict_description()
/freebsd-13-stable/contrib/subversion/subversion/libsvn_client/
HDconflicts.c230 { "add", svn_wc_conflict_action_add },
3341 case svn_wc_conflict_action_add: in describe_incoming_change()
3356 case svn_wc_conflict_action_add: in describe_incoming_change()
3371 case svn_wc_conflict_action_add: in describe_incoming_change()
3388 case svn_wc_conflict_action_add: in describe_incoming_change()
3403 case svn_wc_conflict_action_add: in describe_incoming_change()
3418 case svn_wc_conflict_action_add: in describe_incoming_change()
3436 case svn_wc_conflict_action_add: in describe_incoming_change()
3451 case svn_wc_conflict_action_add: in describe_incoming_change()
3466 case svn_wc_conflict_action_add: in describe_incoming_change()
[all …]
HDmerge.c1928 fb->tree_conflict_action = svn_wc_conflict_action_add; in merge_file_opened()
2758 db->tree_conflict_action = svn_wc_conflict_action_add; in merge_dir_opened()
/freebsd-13-stable/contrib/subversion/subversion/libsvn_wc/
HDtree_conflicts.c68 { "added", svn_wc_conflict_action_add },
HDupdate_editor.c1372 SVN_ERR_ASSERT(action == svn_wc_conflict_action_add); in check_tree_conflict()
1520 if (action != svn_wc_conflict_action_add) in check_tree_conflict()
2131 svn_wc_conflict_action_add, in add_directory()
2159 svn_wc_conflict_action_add, in add_directory()
3007 svn_wc_conflict_action_add, in absent_node()
3347 svn_wc_conflict_action_add, in add_file()
3376 svn_wc_conflict_action_add, in add_file()
HDconflicts.c529 { "added", svn_wc_conflict_action_add },
1330 cdesc->action = svn_wc_conflict_action_add; in generate_propconflict()
2202 desc->action = svn_wc_conflict_action_add; in read_prop_conflict_descs()
3858 if (incoming_change != svn_wc_conflict_action_add) in svn_wc__conflict_tree_update_local_add()
HDwc_db_update_move.c779 ? svn_wc_conflict_action_add in tc_editor_add_directory()
882 ? svn_wc_conflict_action_add in tc_editor_incoming_add_directory()
965 ? svn_wc_conflict_action_add in tc_editor_add_file()
1031 ? svn_wc_conflict_action_add in tc_editor_incoming_add_file()
2935 local_change, svn_wc_conflict_action_add, in mark_update_add_add_tree_conflict()
/freebsd-13-stable/contrib/subversion/subversion/include/
HDsvn_wc.h1626 svn_wc_conflict_action_add, /**< attempting to add object */ enumerator