Searched defs:conflicts (Results 1 - 17 of 17) sorted by relevance

/freebsd-10-stable/contrib/ntp/ntpd/
H A Dntp_filegen.c218 static u_long conflicts = 0; local
/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
H A Dtree_conflicts.c484 const apr_array_header_t *conflicts; local
H A Dinfo.c513 const apr_array_header_t *conflicts; local
[all...]
H A Drevert.c407 apr_hash_t *children, *conflicts; local
H A Dquestions.c368 svn_skel_t *conflicts; local
H A Dcopy.c1008 apr_hash_t *conflicts; /* Unused */ local
H A Dworkqueue.c1100 svn_skel_t *conflicts; local
1287 svn_skel_t *conflicts; local
1352 svn_skel_t *conflicts; local
[all...]
H A Dupgrade.c675 read_tree_conflicts(apr_hash_t **conflicts, argument
719 apr_hash_t *conflicts; local
1550 svn_wc__upgrade_conflict_skel_from_raw(svn_skel_t **conflicts, svn_wc__db_t *db, const char *wri_abspath, const char *local_relpath, const char *conflict_old, const char *conflict_wrk, const char *conflict_new, const char *prej_file, const char *tree_conflict_data, apr_size_t tree_conflict_len, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
H A Ddiff_editor.c551 apr_hash_t *conflicts; local
631 apr_hash_t *conflicts; local
1098 apr_hash_t *conflicts; local
H A Dentries.c352 write_tree_conflicts(const char **conflict_data, apr_hash_t *conflicts, apr_pool_t *pool) argument
H A Dstatus.c1230 apr_hash_t *dirents, *nodes, *conflicts, *all_children; local
H A Dprops.c752 svn_skel_t *conflicts; local
[all...]
H A Dconflicts.c2067 read_prop_conflict_descs(apr_array_header_t *conflicts, svn_wc__db_t *db, const char *local_abspath, svn_skel_t *conflict_skel, svn_boolean_t create_tempfiles, svn_node_kind_t node_kind, svn_wc_operation_t operation, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2251 svn_wc__read_conflicts(const apr_array_header_t **conflicts, svn_skel_t **conflict_skel, svn_wc__db_t *db, const char *local_abspath, svn_boolean_t create_tempfiles, svn_boolean_t only_tree_conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2381 resolve_prop_conflict_on_node(svn_boolean_t *did_resolve, svn_wc__db_t *db, const char *local_abspath, svn_skel_t *conflicts, const char *conflicted_propname, svn_wc_conflict_choice_t conflict_choice, const char *merged_file, const svn_string_t *merged_value, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
2611 resolve_tree_conflict_on_node(svn_boolean_t *did_resolve, svn_wc__db_t *db, const char *local_abspath, const svn_skel_t *conflicts, svn_wc_conflict_choice_t conflict_choice, apr_hash_t *resolve_later, svn_wc_notify_func2_t notify_func, void *notify_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
2900 svn_skel_t *conflicts; local
2977 const apr_array_header_t *conflicts; local
[all...]
H A Dwc_db.c6668 svn_skel_t *conflicts; local
7276 svn_skel_t *conflicts local
9275 read_children_info(svn_wc__db_wcroot_t *wcroot, const char *dir_relpath, apr_hash_t *conflicts, apr_hash_t *nodes, svn_boolean_t base_tree_only, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
9574 svn_wc__db_read_children_info(apr_hash_t **nodes, apr_hash_t **conflicts, svn_wc__db_t *db, const char *dir_abspath, svn_boolean_t base_tree_only, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
13914 svn_skel_t *conflicts; local
13949 svn_skel_t *conflicts; local
15274 svn_wc__db_op_make_copy_internal(svn_wc__db_wcroot_t *wcroot, const char *local_relpath, svn_boolean_t move_move_info, const svn_skel_t *conflicts, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
15358 svn_wc__db_op_make_copy(svn_wc__db_t *db, const char *local_abspath, const svn_skel_t *conflicts, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
[all...]
/freebsd-10-stable/contrib/byacc/
H A Doutput.c19 static Value_t *conflicts = NULL; variable
[all...]
/freebsd-10-stable/contrib/gcc/
H A Dglobal.c173 static INT_TYPE *conflicts; variable
[all...]
/freebsd-10-stable/contrib/subversion/subversion/include/
H A Dsvn_wc.h3245 const apr_array_header_t *conflicts; member in struct:svn_wc_info_t
[all...]

Completed in 229 milliseconds