| /freebsd-13.1/contrib/subversion/subversion/libsvn_client/ |
| H A D | conflicts.c | 132 svn_client_conflict_t *conflict; member
3562 svn_client_conflict_t *conflict, in conflict_tree_get_incoming_description_generic()
4782 svn_client_conflict_t *conflict, in conflict_tree_get_description_incoming_delete()
5765 svn_client_conflict_t *conflict, in conflict_tree_get_description_incoming_add()
6207 svn_client_conflict_t *conflict, in conflict_tree_get_description_incoming_edit()
6365 svn_client_conflict_t *conflict, in svn_client_conflict_tree_get_description()
6673 svn_client_conflict_t *conflict, in verify_local_state_for_incoming_add_upon_update()
6885 svn_client_conflict_t *conflict, in resolve_merge_incoming_added_file_text_update()
7027 svn_client_conflict_t *conflict, in resolve_merge_incoming_added_file_text_merge()
7156 svn_client_conflict_t *conflict, in resolve_merge_incoming_added_file_replace_and_merge()
[all …]
|
| H A D | ctx.c | 57 const svn_wc_conflict_description2_t *conflict, in call_conflict_func()
|
| /freebsd-13.1/contrib/subversion/subversion/libsvn_wc/ |
| H A D | 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()
|
| H A D | 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()
|
| H A D | wc_db_update_move.c | 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
2918 svn_skel_t *conflict; in mark_update_add_add_tree_conflict() local
3690 svn_skel_t *conflict; in bump_mark_tree_conflict() local
3835 svn_skel_t *conflict; in bump_moved_layer() local
4185 svn_skel_t *conflict; in svn_wc__db_op_raise_moved_away_internal() local
[all …]
|
| H A D | copy.c | 256 svn_skel_t *conflict; in copy_versioned_file() local
948 svn_skel_t *conflict; in remove_node_conflict_markers() local
|
| H A D | delete.c | 134 svn_skel_t *conflict; in create_delete_wq_items() local
|
| H A D | 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
|
| H A D | wc_db.c | 155 const svn_skel_t *conflict; member
215 const svn_skel_t *conflict; member
259 const svn_skel_t *conflict; member
2110 svn_skel_t *conflict, in db_base_remove()
2443 svn_skel_t *conflict, in svn_wc__db_base_remove()
3268 svn_wc__db_external_add_file(svn_wc__db_t *db, in svn_wc__db_external_add_file()
6178 const svn_skel_t *conflict, in set_props_txn()
6814 svn_skel_t *conflict; in revert_maybe_raise_moved_away() local
7514 const svn_skel_t *conflict, in remove_node_txn()
7970 svn_skel_t *conflict; member
[all …]
|
| H A D | 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-13.1/contrib/subversion/subversion/svn/ |
| H A D | 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()
|
| H A D | 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()
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()
1754 svn_client_conflict_t *conflict, in handle_tree_conflict()
[all …]
|
| H A D | 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
|
| H A D | 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-13.1/usr.sbin/etcupdate/tests/ |
| H A D | ignore_test.sh | 152 conflict() function
|
| H A D | preworld_test.sh | 191 conflict() function
|
| H A D | conflicts_test.sh | 178 conflict() function
|
| H A D | always_test.sh | 355 conflict() function
|
| H A D | tests_test.sh | 733 conflict() function
|
| H A D | fbsdid_test.sh | 257 conflict() function
|
| /freebsd-13.1/crypto/openssl/crypto/engine/ |
| H A D | eng_list.c | 56 int conflict = 0; in engine_list_add() local
|
| /freebsd-13.1/usr.bin/localedef/ |
| H A D | ctype.c | 334 int conflict = 0; in dump_ctype() local
|
| /freebsd-13.1/contrib/diff/src/ |
| H A D | diff3.c | 1494 bool conflict; in output_diff3_edscript() local
1611 bool conflict; in output_diff3_merge() local
|
| /freebsd-13.1/sys/contrib/openzfs/module/os/linux/zfs/ |
| H A D | zfs_dir.c | 67 boolean_t conflict = B_FALSE; in zfs_match_find() local
|
| /freebsd-13.1/contrib/subversion/subversion/libsvn_fs_x/ |
| H A D | tree.c | 1083 svn_stringbuf_t *conflict, in merge_changes()
1165 svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool); in svn_fs_x__commit_txn() local
1281 svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool); in x_merge() local
|