Home
last modified time | relevance | path

Searched refs:svn_wc_conflict_action_replace (Results 1 – 7 of 7) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/svn/
Dcl-conflicts.c42 { "replace", svn_wc_conflict_action_replace },
178 case svn_wc_conflict_action_replace: in incoming_action_str()
191 case svn_wc_conflict_action_replace: in incoming_action_str()
205 case svn_wc_conflict_action_replace: in incoming_action_str()
302 conflict->action == svn_wc_conflict_action_replace) in svn_cl__get_human_readable_tree_conflict_description()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
Dtree_conflicts.c69 { "replaced", svn_wc_conflict_action_replace },
Dwc_db_update_move.c717 : svn_wc_conflict_action_replace, in tc_editor_add_directory()
798 : svn_wc_conflict_action_replace, in tc_editor_add_file()
1254 : svn_wc_conflict_action_replace, in tc_editor_delete()
Dupdate_editor.c1505 && action != svn_wc_conflict_action_replace) in check_tree_conflict()
2025 reason, svn_wc_conflict_action_replace, in add_directory()
3238 reason, svn_wc_conflict_action_replace, in add_file()
3799 svn_wc_conflict_action_replace, in change_file_prop()
Dconflicts.c530 { "replaced", svn_wc_conflict_action_replace },
2811 || action == svn_wc_conflict_action_replace); in resolve_tree_conflict_on_node()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/
Dmerge.c1944 fb->tree_conflict_action = svn_wc_conflict_action_replace; in merge_file_opened()
1953 fb->tree_conflict_action = svn_wc_conflict_action_replace; in merge_file_opened()
2778 db->tree_conflict_action = svn_wc_conflict_action_replace; in merge_dir_opened()
2787 db->tree_conflict_action = svn_wc_conflict_action_replace; in merge_dir_opened()
/freebsd-10-stable/contrib/subversion/subversion/include/
Dsvn_wc.h1598 svn_wc_conflict_action_replace /**< attempting to replace object, enumerator