Searched defs:conflict (Results 1 - 25 of 35) sorted by path

12

/freebsd-10.0-release/contrib/diff/src/
H A Ddiff3.c1494 bool conflict; local
1611 bool conflict; local
[all...]
/freebsd-10.0-release/contrib/ncurses/progs/
H A Dtic.c1362 bool conflict = FALSE; local
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_client/
H A Dctx.c53 call_conflict_func(svn_wc_conflict_result_t **result, const svn_wc_conflict_description2_t *conflict, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
H A Ddeprecated.c2601 const svn_wc_conflict_description2_t *conflict local
H A Dmerge.c1324 svn_wc_conflict_description2_t *conflict; local
[all...]
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_fs_base/
H A Dtree.c2403 svn_stringbuf_t *conflict; member in struct:merge_args
[all...]
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_fs_fs/
H A Dtree.c1934 merge_changes(dag_node_t *ancestor_node, dag_node_t *source_node, svn_fs_txn_t *txn, svn_stringbuf_t *conflict, apr_pool_t *pool) argument
2015 svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool); local
2123 svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool); local
[all...]
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_repos/
H A Dcommit.c748 const char *conflict; local
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.c316 conflict__get_conflict(svn_skel_t **conflict, const svn_skel_t *conflict_skel, const char *conflict_type) argument
1014 const svn_skel_t *conflict; local
[all...]
H A Dcopy.c208 svn_skel_t *conflict; local
872 svn_skel_t *conflict; local
[all...]
H A Ddelete.c134 svn_skel_t *conflict; local
H A Ddeprecated.c2480 conflict_func_1to2_wrapper(svn_wc_conflict_result_t **result, const svn_wc_conflict_description2_t *conflict, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2950 conflict_description_dup(const svn_wc_conflict_description_t *conflict, apr_pool_t *pool) argument
4422 svn_wc_conflict_description_t *conflict; local
4441 svn_wc_conflict_description_t *conflict; local
4462 svn_wc_conflict_description_t *conflict; local
[all...]
H A Dentries.c467 const svn_wc_conflict_description2_t *conflict = local
881 svn_skel_t *conflict; local
1897 svn_wc_conflict_description2_t *conflict; local
[all...]
H A Dtree_conflicts.c199 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict, argument
331 svn_wc__serialize_conflict(svn_skel_t **skel, const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
403 svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx, const svn_wc_conflict_description2_t *conflict, apr_pool_t *scratch_pool) argument
[all...]
H A Dupdate_editor.c838 complete_conflict(svn_skel_t *conflict, const struct edit_baton *eb, const char *local_abspath, const char *old_repos_relpath, svn_revnum_t old_revision, const char *new_repos_relpath, svn_node_kind_t local_kind, svn_node_kind_t target_kind, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
H A Dupgrade.c695 const svn_wc_conflict_description2_t *conflict; local
730 const svn_wc_conflict_description2_t *conflict = local
[all...]
H A Dutil.c195 svn_wc_conflict_description2_t *conflict; local
214 svn_wc_conflict_description2_t *conflict; local
235 svn_wc_conflict_description2_t *conflict; local
253 svn_wc__conflict_description2_dup(const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
344 svn_wc__cd2_to_cd(const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool) argument
[all...]
H A Dwc_db.c154 const svn_skel_t *conflict; member in struct:insert_base_baton_t
214 const svn_skel_t *conflict; member in struct:insert_working_baton_t
258 const svn_skel_t *conflict; member in struct:insert_external_baton_t
1629 svn_wc__db_base_add_directory(svn_wc__db_t *db, const char *local_abspath, const char *wri_abspath, const char *repos_relpath, const char *repos_root_url, const char *repos_uuid, svn_revnum_t revision, const apr_hash_t *props, svn_revnum_t changed_rev, apr_time_t changed_date, const char *changed_author, const apr_array_header_t *children, svn_depth_t depth, apr_hash_t *dav_cache, const svn_skel_t *conflict, svn_boolean_t update_actual_props, apr_hash_t *new_actual_props, apr_array_header_t *new_iprops, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
1713 svn_wc__db_base_add_incomplete_directory(svn_wc__db_t *db, const char *local_abspath, const char *repos_relpath, const char *repos_root_url, const char *repos_uuid, svn_revnum_t revision, svn_depth_t depth, svn_boolean_t insert_base_deleted, svn_boolean_t delete_working, svn_skel_t *conflict, svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
1768 svn_wc__db_base_add_file(svn_wc__db_t *db, const char *local_abspath, const char *wri_abspath, const char *repos_relpath, const char *repos_root_url, const char *repos_uuid, svn_revnum_t revision, const apr_hash_t *props, svn_revnum_t changed_rev, apr_time_t changed_date, const char *changed_author, const svn_checksum_t *checksum, apr_hash_t *dav_cache, svn_boolean_t delete_working, svn_boolean_t update_actual_props, apr_hash_t *new_actual_props, apr_array_header_t *new_iprops, svn_boolean_t keep_recorded_info, svn_boolean_t insert_base_deleted, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
1856 svn_wc__db_base_add_symlink(svn_wc__db_t *db, const char *local_abspath, const char *wri_abspath, const char *repos_relpath, const char *repos_root_url, const char *repos_uuid, svn_revnum_t revision, const apr_hash_t *props, svn_revnum_t changed_rev, apr_time_t changed_date, const char *changed_author, const char *target, apr_hash_t *dav_cache, svn_boolean_t delete_working, svn_boolean_t update_actual_props, apr_hash_t *new_actual_props, apr_array_header_t *new_iprops, svn_boolean_t keep_recorded_info, svn_boolean_t insert_base_deleted, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
1943 add_excluded_or_not_present_node(svn_wc__db_t *db, const char *local_abspath, const char *repos_relpath, const char *repos_root_url, const char *repos_uuid, svn_revnum_t revision, svn_node_kind_t kind, svn_wc__db_status_t status, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
2016 svn_wc__db_base_add_excluded_node(svn_wc__db_t *db, const char *local_abspath, const char *repos_relpath, const char *repos_root_url, const char *repos_uuid, svn_revnum_t revision, svn_node_kind_t kind, svn_wc__db_status_t status, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
2038 svn_wc__db_base_add_not_present_node(svn_wc__db_t *db, const char *local_abspath, const char *repos_relpath, const char *repos_root_url, const char *repos_uuid, svn_revnum_t revision, svn_node_kind_t kind, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
2084 db_base_remove(svn_wc__db_wcroot_t *wcroot, const char *local_relpath, svn_wc__db_t *db, svn_boolean_t keep_as_working, svn_boolean_t queue_deletes, svn_boolean_t remove_locks, svn_revnum_t not_present_revision, svn_skel_t *conflict, svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
2343 svn_wc__db_base_remove(svn_wc__db_t *db, const char *local_abspath, svn_boolean_t keep_as_working, svn_boolean_t queue_deletes, svn_boolean_t remove_locks, svn_revnum_t not_present_revision, svn_skel_t *conflict, svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
3109 svn_wc__db_external_add_file(svn_wc__db_t *db, const char *local_abspath, const char *wri_abspath, const char *repos_relpath, const char *repos_root_url, const char *repos_uuid, svn_revnum_t revision, const apr_hash_t *props, apr_array_header_t *iprops, svn_revnum_t changed_rev, apr_time_t changed_date, const char *changed_author, const svn_checksum_t *checksum, const apr_hash_t *dav_cache, const char *record_ancestor_abspath, const char *recorded_repos_relpath, svn_revnum_t recorded_peg_revision, svn_revnum_t recorded_revision, svn_boolean_t update_actual_props, apr_hash_t *new_actual_props, svn_boolean_t keep_recorded_info, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
5225 svn_wc__db_op_copy_dir(svn_wc__db_t *db, const char *local_abspath, const apr_hash_t *props, svn_revnum_t changed_rev, apr_time_t changed_date, const char *changed_author, const char *original_repos_relpath, const char *original_root_url, const char *original_uuid, svn_revnum_t original_revision, const apr_array_header_t *children, svn_boolean_t is_move, svn_depth_t depth, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
5302 svn_wc__db_op_copy_file(svn_wc__db_t *db, const char *local_abspath, const apr_hash_t *props, svn_revnum_t changed_rev, apr_time_t changed_date, const char *changed_author, const char *original_repos_relpath, const char *original_root_url, const char *original_uuid, svn_revnum_t original_revision, const svn_checksum_t *checksum, svn_boolean_t update_actual_props, const apr_hash_t *new_actual_props, svn_boolean_t is_move, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
5387 svn_wc__db_op_copy_symlink(svn_wc__db_t *db, const char *local_abspath, const apr_hash_t *props, svn_revnum_t changed_rev, apr_time_t changed_date, const char *changed_author, const char *original_repos_relpath, const char *original_root_url, const char *original_uuid, svn_revnum_t original_revision, const char *target, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
5692 set_props_txn(svn_wc__db_wcroot_t *wcroot, const char *local_relpath, apr_hash_t *props, svn_boolean_t clear_recorded_info, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
5738 svn_wc__db_op_set_props(svn_wc__db_t *db, const char *local_abspath, apr_hash_t *props, svn_boolean_t clear_recorded_info, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
6395 svn_skel_t *conflict; local
6923 remove_node_txn(svn_boolean_t *left_changes, svn_wc__db_wcroot_t *wcroot, const char *local_relpath, svn_wc__db_t *db, svn_boolean_t destroy_wc, svn_boolean_t destroy_changes, svn_revnum_t not_present_rev, svn_wc__db_status_t not_present_status, svn_node_kind_t not_present_kind, const svn_skel_t *conflict, const svn_skel_t *work_items, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
7186 svn_wc__db_op_remove_node(svn_boolean_t *left_changes, svn_wc__db_t *db, const char *local_abspath, svn_boolean_t destroy_wc, svn_boolean_t destroy_changes, svn_revnum_t not_present_revision, svn_wc__db_status_t not_present_status, svn_node_kind_t not_present_kind, const svn_skel_t *conflict, const svn_skel_t *work_items, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
7420 svn_skel_t *conflict; member in struct:op_delete_baton_t
7898 svn_wc__db_op_delete(svn_wc__db_t *db, const char *local_abspath, const char *moved_to_abspath, svn_boolean_t delete_dir_externals, svn_skel_t *conflict, svn_skel_t *work_items, svn_cancel_func_t cancel_func, void *cancel_baton, svn_wc_notify_func2_t notify_func, void *notify_baton, apr_pool_t *scratch_pool) argument
10882 svn_wc__db_global_update(svn_wc__db_t *db, const char *local_abspath, svn_node_kind_t new_kind, const char *new_repos_relpath, svn_revnum_t new_revision, const apr_hash_t *new_props, svn_revnum_t new_changed_rev, apr_time_t new_changed_date, const char *new_changed_author, const apr_array_header_t *new_children, const svn_checksum_t *new_checksum, const char *new_target, const apr_hash_t *new_dav_cache, const svn_skel_t *conflict, const svn_skel_t *work_items, apr_pool_t *scratch_pool) argument
13106 svn_wc__db_read_conflict(svn_skel_t **conflict, svn_wc__db_t *db, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
13127 svn_wc__db_read_conflict_internal(svn_skel_t **conflict, svn_wc__db_wcroot_t *wcroot, const char *local_relpath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
H A Dwc_db_update_move.c234 svn_skel_t *conflict; local
2158 svn_skel_t *conflict; local
[all...]
/freebsd-10.0-release/contrib/subversion/subversion/svn/
H A Dcl-conflicts.c188 svn_cl__get_human_readable_prop_conflict_description( const char **desc, const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
242 svn_cl__get_human_readable_tree_conflict_description( const char **desc, const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
333 append_tree_conflict_info_xml(svn_stringbuf_t *str, const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
379 svn_cl__append_conflict_info_xml(svn_stringbuf_t *str, const svn_wc_conflict_description2_t *conflict, apr_pool_t *scratch_pool) argument
[all...]
H A Dinfo-cmd.c239 const svn_wc_conflict_description2_t *conflict = local
446 const svn_wc_conflict_description2_t *conflict = local
503 const svn_wc_conflict_description2_t *conflict = local
[all...]
/freebsd-10.0-release/crypto/openssl/crypto/engine/
H A Deng_list.c98 int conflict = 0; local
/freebsd-10.0-release/gnu/usr.bin/rcs/lib/
H A Dpartime.c645 # define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b)) macro
663 # undef conflict macro
[all...]
/freebsd-10.0-release/sbin/gvinum/
H A Dgvinum.c567 int i, n, begin, len, conflict; local
/freebsd-10.0-release/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/
H A Ddmu_objset.c1428 dmu_snapshot_realname(objset_t *os, char *name, char *real, int maxlen, boolean_t *conflict) argument

Completed in 444 milliseconds

12