| /freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
| HD | conflicts.c | 132 svn_client_conflict_t *conflict; member
200 svn_client_conflict_t *conflict, in add_legacy_desc_to_conflict()
1115 svn_client_conflict_t *conflict, in describe_local_file_node_change()
1339 svn_client_conflict_t *conflict, in describe_local_dir_node_change()
2219 svn_client_conflict_t *conflict, in find_revision_for_suspected_deletion()
2414 svn_client_conflict_t *conflict, in find_related_node()
2787 conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, in conflict_tree_get_details_local_missing()
3103 svn_client_conflict_t *conflict, in describe_local_none_node_change()
3196 svn_client_conflict_t *conflict, in conflict_tree_get_local_description_generic()
3231 svn_client_conflict_t *conflict, in conflict_tree_get_description_local_missing()
[all …]
|
| HD | ctx.c | 57 const svn_wc_conflict_description2_t *conflict, in call_conflict_func()
|
| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| HD | util.c | 195 svn_wc_conflict_description2_t *conflict; in svn_wc_conflict_description_create_text2() local
214 svn_wc_conflict_description2_t *conflict; in svn_wc_conflict_description_create_prop2() local
235 svn_wc_conflict_description2_t *conflict; in svn_wc_conflict_description_create_tree2() local
278 svn_wc_conflict_description2_dup(const svn_wc_conflict_description2_t *conflict, in svn_wc_conflict_description2_dup()
359 svn_wc__cd2_to_cd(const svn_wc_conflict_description2_t *conflict, in svn_wc__cd2_to_cd()
|
| HD | tree_conflicts.c | 200 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict, in svn_wc__deserialize_conflict()
333 const svn_wc_conflict_description2_t *conflict, in svn_wc__serialize_conflict()
407 const svn_wc_conflict_description2_t *conflict, in svn_wc__add_tree_conflict()
|
| HD | wc_db_update_move.c | 291 svn_skel_t *conflict, in update_move_list_add()
407 svn_skel_t *conflict; in create_tree_conflict() local
624 svn_skel_t *conflict; in mark_tc_on_op_root() local
730 svn_skel_t *conflict = NULL; in tc_editor_add_directory() local
861 svn_skel_t *conflict = NULL; in tc_editor_incoming_add_directory() local
920 svn_skel_t *conflict = NULL; in tc_editor_add_file() local
1011 svn_skel_t *conflict = NULL; in tc_editor_incoming_add_file() local
1681 svn_skel_t *conflict = NULL; in tc_editor_delete() local
1813 svn_skel_t *conflict = NULL; in tc_incoming_editor_delete() local
2918 svn_skel_t *conflict; in mark_update_add_add_tree_conflict() local
[all …]
|
| HD | copy.c | 256 svn_skel_t *conflict; in copy_versioned_file() local
948 svn_skel_t *conflict; in remove_node_conflict_markers() local
|
| HD | conflicts.c | 317 conflict__get_conflict(svn_skel_t **conflict, in conflict__get_conflict()
1046 const svn_skel_t *conflict; in svn_wc__conflict_read_markers() local
1604 const svn_skel_t *conflict, in build_text_conflict_resolve_items()
2920 svn_skel_t *conflict; in svn_wc__mark_resolved_text_conflict() local
3031 svn_skel_t *conflict; in conflict_status_walker() local
3406 svn_skel_t *conflict; in svn_wc__conflict_text_mark_resolved() local
|
| HD | delete.c | 134 svn_skel_t *conflict; in create_delete_wq_items() local
|
| HD | wc_db.c | 155 const svn_skel_t *conflict; member
215 const svn_skel_t *conflict; member
259 const svn_skel_t *conflict; member
1634 const svn_skel_t *conflict, in svn_wc__db_base_add_directory()
1710 svn_skel_t *conflict, in svn_wc__db_base_add_incomplete_directory()
1775 const svn_skel_t *conflict, in svn_wc__db_base_add_file()
1863 const svn_skel_t *conflict, in svn_wc__db_base_add_symlink()
1939 const svn_skel_t *conflict, in add_excluded_or_not_present_node()
2012 const svn_skel_t *conflict, in svn_wc__db_base_add_excluded_node()
2033 const svn_skel_t *conflict, in svn_wc__db_base_add_not_present_node()
[all …]
|
| HD | entries.c | 494 const svn_wc_conflict_description2_t *conflict = in read_one_entry() local
939 svn_skel_t *conflict; in read_one_entry() local
2018 svn_wc_conflict_description2_t *conflict; in write_entry() local
|
| /freebsd-11-stable/contrib/subversion/subversion/svn/ |
| HD | cl-conflicts.c | 224 svn_client_conflict_t *conflict, in svn_cl__get_human_readable_prop_conflict_description()
283 svn_client_conflict_t *conflict, in svn_cl__get_human_readable_tree_conflict_description()
406 svn_client_conflict_t *conflict, in append_tree_conflict_info_xml()
474 svn_client_conflict_t *conflict, in svn_cl__append_conflict_info_xml()
|
| HD | conflict-callbacks.c | 92 show_diff(svn_client_conflict_t *conflict, in show_diff()
174 show_conflicts(svn_client_conflict_t *conflict, in show_conflicts()
573 svn_client_conflict_t *conflict, in find_option_by_builtin()
764 svn_client_conflict_t *conflict, in build_text_conflict_options()
826 mark_conflict_resolved(svn_client_conflict_t *conflict, in mark_conflict_resolved()
877 svn_client_conflict_t *conflict, in handle_text_conflict()
1226 svn_client_conflict_t *conflict, in build_prop_conflict_options()
1285 svn_client_conflict_t *conflict, in handle_one_prop_conflict()
1412 svn_client_conflict_t *conflict, in handle_prop_conflicts()
1478 svn_client_conflict_t *conflict, in build_tree_conflict_options()
[all …]
|
| HD | resolve-cmd.c | 57 conflict_walker(void *baton, svn_client_conflict_t *conflict, in conflict_walker()
109 svn_client_conflict_t *conflict; in svn_cl__walk_conflicts() local
|
| HD | info-cmd.c | 687 svn_client_conflict_t *conflict; in print_info_xml() local
890 svn_client_conflict_t *conflict; in print_info() local
|
| /freebsd-11-stable/usr.sbin/etcupdate/tests/ |
| HD | ignore_test.sh | 152 conflict() function
|
| HD | preworld_test.sh | 191 conflict() function
|
| HD | conflicts_test.sh | 178 conflict() function
|
| HD | always_test.sh | 355 conflict() function
|
| HD | fbsdid_test.sh | 257 conflict() function
|
| HD | tests_test.sh | 733 conflict() function
|
| /freebsd-11-stable/crypto/openssl/crypto/engine/ |
| HD | eng_list.c | 105 int conflict = 0; in engine_list_add() local
|
| /freebsd-11-stable/usr.bin/localedef/ |
| HD | ctype.c | 326 int conflict = 0; in dump_ctype() local
|
| /freebsd-11-stable/gnu/usr.bin/rcs/lib/ |
| HD | partime.c | 645 # define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b)) macro
|
| /freebsd-11-stable/usr.sbin/timed/timed/ |
| HD | timed.c | 475 struct tsp resp, conflict, *answer; in lookformaster() local
|
| /freebsd-11-stable/contrib/diff/src/ |
| HD | diff3.c | 1494 bool conflict; in output_diff3_edscript() local
1611 bool conflict; in output_diff3_merge() local
|