Home
last modified time | relevance | path

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

/freebsd-11-stable/contrib/subversion/subversion/svn/
HDcl-conflicts.c40 { "delete", svn_wc_conflict_action_delete },
168 case svn_wc_conflict_action_delete: in incoming_action_str()
181 case svn_wc_conflict_action_delete: in incoming_action_str()
195 case svn_wc_conflict_action_delete: in incoming_action_str()
261 case svn_wc_conflict_action_delete: in svn_cl__get_human_readable_prop_conflict_description()
301 conflict_action == svn_wc_conflict_action_delete) in svn_cl__get_human_readable_tree_conflict_description()
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
HDconflicts.c530 { "deleted", svn_wc_conflict_action_delete },
1332 cdesc->action = svn_wc_conflict_action_delete; in generate_propconflict()
1846 else if (action == svn_wc_conflict_action_delete in read_tree_conflict_desc()
2200 desc->action = svn_wc_conflict_action_delete; in read_prop_conflict_descs()
2729 if (action != svn_wc_conflict_action_delete) in resolve_tree_conflict_on_node()
2860 SVN_ERR_ASSERT(action == svn_wc_conflict_action_delete in resolve_tree_conflict_on_node()
3545 if (action != svn_wc_conflict_action_delete) in svn_wc__conflict_tree_update_break_moved_away()
3791 if (incoming_change != svn_wc_conflict_action_delete) in svn_wc__conflict_tree_update_incoming_move()
HDtree_conflicts.c67 { "deleted", svn_wc_conflict_action_delete },
HDwc_db_update_move.c1519 svn_wc_conflict_action_delete, in tc_editor_update_incoming_moved_file()
1694 svn_wc_conflict_action_delete, in tc_editor_delete()
1723 ? svn_wc_conflict_action_delete in tc_editor_delete()
1826 svn_wc_conflict_action_delete, in tc_incoming_editor_delete()
1855 ? svn_wc_conflict_action_delete in tc_incoming_editor_delete()
HDupdate_editor.c1450 SVN_ERR_ASSERT(action == svn_wc_conflict_action_delete); in check_tree_conflict()
1508 && action != svn_wc_conflict_action_delete in check_tree_conflict()
1744 svn_wc_conflict_action_delete, in delete_entry()
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
HDconflicts.c229 { "delete", svn_wc_conflict_action_delete },
3343 case svn_wc_conflict_action_delete: in describe_incoming_change()
3358 case svn_wc_conflict_action_delete: in describe_incoming_change()
3373 case svn_wc_conflict_action_delete: in describe_incoming_change()
3390 case svn_wc_conflict_action_delete: in describe_incoming_change()
3405 case svn_wc_conflict_action_delete: in describe_incoming_change()
3420 case svn_wc_conflict_action_delete: in describe_incoming_change()
3438 case svn_wc_conflict_action_delete: in describe_incoming_change()
3453 case svn_wc_conflict_action_delete: in describe_incoming_change()
3468 case svn_wc_conflict_action_delete: in describe_incoming_change()
[all …]
HDmerge.c1379 action != svn_wc_conflict_action_delete, in record_tree_conflict()
1827 fb->tree_conflict_action = svn_wc_conflict_action_delete; in merge_file_opened()
1905 fb->tree_conflict_action = svn_wc_conflict_action_delete; in merge_file_opened()
2533 svn_wc_conflict_action_delete, in merge_file_deleted()
2614 db->tree_conflict_action = svn_wc_conflict_action_delete; in merge_dir_opened()
2719 db->tree_conflict_action = svn_wc_conflict_action_delete; in merge_dir_opened()
3354 svn_wc_conflict_action_delete, in merge_dir_deleted()
/freebsd-11-stable/contrib/subversion/subversion/include/
HDsvn_wc.h1627 svn_wc_conflict_action_delete, /**< attempting to delete object */ enumerator