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

/freebsd-10.1-release/contrib/ntp/ntpd/
H A Dntp_filegen.c218 static u_long conflicts = 0; local
/freebsd-10.1-release/contrib/subversion/subversion/libsvn_wc/
H A Dtree_conflicts.c482 const apr_array_header_t *conflicts; local
H A Dquestions.c376 svn_skel_t *conflicts; local
H A Dcopy.c930 apr_hash_t *conflicts; /* Unused */ local
H A Dworkqueue.c1132 svn_skel_t *conflicts; local
1318 svn_skel_t *conflicts; local
1383 svn_skel_t *conflicts; local
[all...]
H A Dconflicts.c2056 read_prop_conflicts(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
2211 svn_wc__read_conflicts(const apr_array_header_t **conflicts, svn_wc__db_t *db, const char *local_abspath, svn_boolean_t create_tempfiles, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2383 svn_skel_t *conflicts; local
2568 svn_skel_t *conflicts; local
2716 svn_skel_t *conflicts; local
2894 const apr_array_header_t *conflicts; local
[all...]
H A Ddiff_editor.c591 apr_hash_t *conflicts; local
670 apr_hash_t *conflicts; local
1084 apr_hash_t *conflicts; local
H A Dentries.c338 write_tree_conflicts(const char **conflict_data, apr_hash_t *conflicts, apr_pool_t *pool) argument
H A Dstatus.c1216 apr_hash_t *dirents, *nodes, *conflicts, *all_children; local
H A Dupgrade.c674 read_tree_conflicts(apr_hash_t **conflicts, argument
718 apr_hash_t *conflicts; local
1365 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 Dwc_db.c6296 svn_skel_t *conflicts; local
6824 svn_skel_t *conflicts = svn_skel__parse(conflict_data, local
8770 read_children_info(svn_wc__db_wcroot_t *wcroot, const char *dir_relpath, apr_hash_t *conflicts, apr_hash_t *nodes, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
9052 svn_wc__db_read_children_info(apr_hash_t **nodes, apr_hash_t **conflicts, svn_wc__db_t *db, const char *dir_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
13502 svn_skel_t *conflicts; local
13537 svn_skel_t *conflicts; local
14608 make_copy_txn(svn_wc__db_wcroot_t *wcroot, const char *local_relpath, int op_depth, const svn_skel_t *conflicts, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
14714 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.1-release/contrib/byacc/
H A Doutput.c19 static Value_t *conflicts = NULL; variable
[all...]
/freebsd-10.1-release/contrib/gcc/
H A Dglobal.c173 static INT_TYPE *conflicts; variable
[all...]
/freebsd-10.1-release/contrib/subversion/subversion/include/
H A Dsvn_wc.h3153 const apr_array_header_t *conflicts; member in struct:svn_wc_info_t
[all...]

Completed in 287 milliseconds