Searched refs:svn_client_conflict_option_unspecified (Results 1 – 3 of 3) sorted by relevance
603 (recommended_id != svn_client_conflict_option_unspecified && in find_option_by_builtin()905 option_id = svn_client_conflict_option_unspecified; in handle_text_conflict()1205 if (option_id != svn_client_conflict_option_unspecified && in handle_text_conflict()1442 if (option_id != svn_client_conflict_option_unspecified && in handle_prop_conflicts()1775 option_id = svn_client_conflict_option_unspecified; in handle_tree_conflict()1954 if (option_id != svn_client_conflict_option_unspecified && in handle_tree_conflict()2057 option_id = svn_client_conflict_option_unspecified; in svn_cl__resolve_conflict()2145 option_id = svn_client_conflict_option_unspecified; in svn_cl__resolve_conflict()2185 option_id = svn_client_conflict_option_unspecified; in svn_cl__resolve_conflict()2240 if (recommended_id != svn_client_conflict_option_unspecified) in svn_cl__resolve_conflict()[all …]
188 case svn_client_conflict_option_unspecified: in conflict_option_id_to_wc_conflict_choice()12854 return svn_client_conflict_option_unspecified; in svn_client_conflict_prop_get_resolution()13262 (*conflict)->resolution_text = svn_client_conflict_option_unspecified; in svn_client_conflict_get()13263 (*conflict)->resolution_tree = svn_client_conflict_option_unspecified; in svn_client_conflict_get()13265 (*conflict)->recommended_option_id = svn_client_conflict_option_unspecified; in svn_client_conflict_get()13394 if (resolution != svn_client_conflict_option_unspecified && in conflict_status_walker()
4598 svn_client_conflict_option_unspecified, enumerator