| /freebsd-10-stable/contrib/subversion/subversion/svn/ |
| D | cl-conflicts.c | 232 const svn_wc_conflict_description2_t *conflict, in svn_cl__get_human_readable_prop_conflict_description()
286 const svn_wc_conflict_description2_t *conflict, in svn_cl__get_human_readable_tree_conflict_description()
398 const svn_wc_conflict_description2_t *conflict, in append_tree_conflict_info_xml()
444 const svn_wc_conflict_description2_t *conflict, in svn_cl__append_conflict_info_xml()
|
| D | info-cmd.c | 397 const svn_wc_conflict_description2_t *conflict = in print_info_xml() local
590 const svn_wc_conflict_description2_t *conflict = in print_info() local
653 const svn_wc_conflict_description2_t *conflict = in print_info() local
|
| /freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/ |
| 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()
|
| 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()
|
| D | wc_db_update_move.c | 236 svn_skel_t *conflict, in update_move_list_add()
352 svn_skel_t *conflict; in create_tree_conflict() local
561 svn_skel_t *conflict; in mark_tc_on_op_root() local
667 svn_skel_t *conflict = NULL; in tc_editor_add_directory() local
752 svn_skel_t *conflict = NULL; in tc_editor_add_file() local
1211 svn_skel_t *conflict = NULL; in tc_editor_delete() local
1900 svn_skel_t *conflict; in bump_mark_tree_conflict() local
2045 svn_skel_t *conflict; in bump_moved_layer() local
2395 svn_skel_t *conflict; in svn_wc__db_op_raise_moved_away_internal() local
2445 svn_skel_t *conflict; in svn_wc__db_op_raise_moved_away() local
|
| D | copy.c | 256 svn_skel_t *conflict; in copy_versioned_file() local
947 svn_skel_t *conflict; in remove_node_conflict_markers() local
|
| D | conflicts.c | 316 conflict__get_conflict(svn_skel_t **conflict, in conflict__get_conflict()
1011 const svn_skel_t *conflict; in svn_wc__conflict_read_markers() local
1569 const svn_skel_t *conflict, in build_text_conflict_resolve_items()
2870 svn_skel_t *conflict; in svn_wc__mark_resolved_text_conflict() local
2981 svn_skel_t *conflict; in conflict_status_walker() local
|
| D | delete.c | 134 svn_skel_t *conflict; in create_delete_wq_items() local
|
| 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
1637 const svn_skel_t *conflict, in svn_wc__db_base_add_directory()
1713 svn_skel_t *conflict, in svn_wc__db_base_add_incomplete_directory()
1778 const svn_skel_t *conflict, in svn_wc__db_base_add_file()
1866 const svn_skel_t *conflict, in svn_wc__db_base_add_symlink()
1942 const svn_skel_t *conflict, in add_excluded_or_not_present_node()
2015 const svn_skel_t *conflict, in svn_wc__db_base_add_excluded_node()
2036 const svn_skel_t *conflict, in svn_wc__db_base_add_not_present_node()
[all …]
|
| 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
|
| D | upgrade.c | 696 const svn_wc_conflict_description2_t *conflict; in read_tree_conflicts() local
731 const svn_wc_conflict_description2_t *conflict = apr_hash_this_val(hi); in migrate_single_tree_conflict_data() local
|
| /freebsd-10-stable/usr.sbin/etcupdate/tests/ |
| D | ignore_test.sh | 152 conflict() function
|
| D | preworld_test.sh | 191 conflict() function
|
| D | always_test.sh | 355 conflict() function
|
| D | conflicts_test.sh | 178 conflict() function
|
| D | fbsdid_test.sh | 257 conflict() function
|
| D | tests_test.sh | 733 conflict() function
|
| /freebsd-10-stable/contrib/subversion/subversion/libsvn_client/ |
| D | ctx.c | 57 const svn_wc_conflict_description2_t *conflict, in call_conflict_func()
|
| /freebsd-10-stable/crypto/openssl/crypto/engine/ |
| D | eng_list.c | 104 int conflict = 0; in engine_list_add() local
|
| /freebsd-10-stable/usr.sbin/pkg_install/add/ |
| D | perform.c | 79 char *conflict[2]; in pkg_do() local
|
| /freebsd-10-stable/gnu/usr.bin/rcs/lib/ |
| D | partime.c | 645 # define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b)) macro
|
| /freebsd-10-stable/usr.sbin/timed/timed/ |
| D | timed.c | 478 struct tsp resp, conflict, *answer; in lookformaster() local
|
| /freebsd-10-stable/contrib/diff/src/ |
| D | diff3.c | 1494 bool conflict; in output_diff3_edscript() local
1611 bool conflict; in output_diff3_merge() local
|
| /freebsd-10-stable/contrib/ncurses/progs/ |
| D | tic.c | 1362 bool conflict = FALSE; in check_termtype() local
|
| /freebsd-10-stable/sbin/gvinum/ |
| D | gvinum.c | 572 int i, n, begin, len, conflict; in find_name() local
|