Home
last modified time | relevance | path

Searched refs:svn_wc_conflict_action_edit (Results 1 – 11 of 11) sorted by relevance

/trueos/contrib/subversion/subversion/svn/
HDcl-conflicts.c39 { "edit", svn_wc_conflict_action_edit },
140 case svn_wc_conflict_action_edit: in incoming_action_str()
153 case svn_wc_conflict_action_edit: in incoming_action_str()
219 case svn_wc_conflict_action_edit: in svn_cl__get_human_readable_prop_conflict_description()
252 if (conflict->action == svn_wc_conflict_action_edit || in svn_cl__get_human_readable_tree_conflict_description()
HDconflict-callbacks.c1098 if (desc->action == svn_wc_conflict_action_edit) in handle_tree_conflict()
1328 && (desc->action == svn_wc_conflict_action_edit) in conflict_func_interactive()
/trueos/contrib/subversion/subversion/libsvn_wc/
HDquestions.c491 && action == svn_wc_conflict_action_edit) in internal_conflicted_p()
HDconflicts.c528 { "edited", svn_wc_conflict_action_edit },
981 *incoming_change = svn_wc_conflict_action_edit; in svn_wc__conflict_read_tree_conflict()
1420 cdesc->action = svn_wc_conflict_action_edit; in generate_propconflict()
2142 desc->action = svn_wc_conflict_action_edit; in read_prop_conflicts()
2774 && action == svn_wc_conflict_action_edit) in resolve_tree_conflict_on_node()
HDtree_conflicts.c65 { "edited", svn_wc_conflict_action_edit },
HDwc_db_update_move.c427 action = svn_wc_conflict_action_edit; in check_tree_conflict()
816 svn_wc_conflict_action_edit, in tc_editor_alter_directory()
1046 svn_wc_conflict_action_edit, in tc_editor_alter_file()
2120 svn_wc_conflict_action_edit, in bump_mark_tree_conflict()
HDutil.c203 conflict->action = svn_wc_conflict_action_edit; in svn_wc_conflict_description_create_text2()
HDupdate_editor.c1263 svn_wc_conflict_action_edit, in open_root()
1523 if (action == svn_wc_conflict_action_edit) in check_tree_conflict()
1607 if (action != svn_wc_conflict_action_edit in check_tree_conflict()
2451 svn_wc_conflict_action_edit, in open_directory()
3571 svn_wc_conflict_action_edit, in open_file()
HDdeprecated.c4429 conflict->action = svn_wc_conflict_action_edit; in svn_wc_conflict_description_create_text()
/trueos/contrib/subversion/subversion/include/
HDsvn_wc.h1577 svn_wc_conflict_action_edit, /**< attempting to change text or props */ enumerator
/trueos/contrib/subversion/subversion/libsvn_client/
HDmerge.c1741 fb->tree_conflict_action = svn_wc_conflict_action_edit; in merge_file_opened()
2471 db->tree_conflict_action = svn_wc_conflict_action_edit; in merge_dir_opened()
7563 dir_baton.tree_conflict_action = svn_wc_conflict_action_edit; in do_file_merge()