Searched defs:conflicted (Results 1 - 16 of 16) sorted by relevance

/freebsd-11.0-release/contrib/subversion/subversion/libsvn_wc/
H A Ddelete.c110 create_delete_wq_items(svn_skel_t **work_items, svn_wc__db_t *db, const char *local_abspath, svn_node_kind_t kind, svn_boolean_t conflicted, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
201 svn_boolean_t conflicted = FALSE; local
328 svn_boolean_t conflicted; local
H A Dinfo.c95 svn_boolean_t conflicted; local
H A Dwc_db.h1997 svn_boolean_t conflicted; member in struct:svn_wc__db_info_t
[all...]
H A Dwc_db_wcroot.c874 svn_boolean_t conflicted; local
H A Dadm_crawler.c388 svn_boolean_t conflicted; local
723 svn_boolean_t conflicted; local
H A Dadm_ops.c416 svn_boolean_t conflicted; local
H A Dcopy.c222 copy_versioned_file(svn_wc__db_t *db, const char *src_abspath, const char *dst_abspath, const char *dst_op_root_abspath, const char *tmpdir_abspath, svn_boolean_t metadata_only, svn_boolean_t conflicted, svn_boolean_t is_move, const svn_io_dirent2_t *dirent, svn_filesize_t recorded_size, apr_time_t recorded_time, 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
591 svn_boolean_t conflicted; local
1070 svn_boolean_t conflicted; local
[all...]
H A Dmerge.c1248 svn_boolean_t conflicted; local
H A Dconflicts.c1877 apr_hash_t *conflicted; local
3118 svn_boolean_t conflicted; local
[all...]
H A Dentries.c415 svn_boolean_t conflicted; local
H A Dprops.c180 svn_boolean_t conflicted; local
H A Dstatus.c357 svn_boolean_t conflicted; local
1095 svn_boolean_t conflicted = info ? info->conflicted local
[all...]
H A Dupdate_editor.c1544 already_in_a_tree_conflict(svn_boolean_t *conflicted, svn_boolean_t *ignored, svn_wc__db_t *db, const char *local_abspath, apr_pool_t *scratch_pool) argument
1584 node_already_conflicted(svn_boolean_t *conflicted, svn_boolean_t *conflict_ignored, svn_wc__db_t *db, const char *local_abspath, apr_pool_t *scratch_pool) argument
1613 svn_boolean_t conflicted; local
1857 svn_boolean_t conflicted; local
2234 svn_boolean_t conflicted; local
3061 svn_boolean_t conflicted; local
3403 svn_boolean_t conflicted; local
[all...]
H A Dwc_db.c8806 read_info(svn_wc__db_status_t *status, svn_node_kind_t *kind, svn_revnum_t *revision, const char **repos_relpath, apr_int64_t *repos_id, svn_revnum_t *changed_rev, apr_time_t *changed_date, const char **changed_author, svn_depth_t *depth, const svn_checksum_t **checksum, const char **target, const char **original_repos_relpath, apr_int64_t *original_repos_id, svn_revnum_t *original_revision, svn_wc__db_lock_t **lock, svn_filesize_t *recorded_size, apr_time_t *recorded_time, const char **changelist, svn_boolean_t *conflicted, svn_boolean_t *op_root, svn_boolean_t *had_props, svn_boolean_t *props_mod, svn_boolean_t *have_base, svn_boolean_t *have_more_work, svn_boolean_t *have_work, svn_wc__db_wcroot_t *wcroot, const char *local_relpath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
9131 svn_wc__db_read_info_internal(svn_wc__db_status_t *status, svn_node_kind_t *kind, svn_revnum_t *revision, const char **repos_relpath, apr_int64_t *repos_id, svn_revnum_t *changed_rev, apr_time_t *changed_date, const char **changed_author, svn_depth_t *depth, const svn_checksum_t **checksum, const char **target, const char **original_repos_relpath, apr_int64_t *original_repos_id, svn_revnum_t *original_revision, svn_wc__db_lock_t **lock, svn_filesize_t *recorded_size, apr_time_t *recorded_time, const char **changelist, svn_boolean_t *conflicted, svn_boolean_t *op_root, svn_boolean_t *had_props, svn_boolean_t *props_mod, svn_boolean_t *have_base, svn_boolean_t *have_more_work, svn_boolean_t *have_work, svn_wc__db_wcroot_t *wcroot, const char *local_relpath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
9174 svn_wc__db_read_info(svn_wc__db_status_t *status, svn_node_kind_t *kind, svn_revnum_t *revision, const char **repos_relpath, const char **repos_root_url, const char **repos_uuid, svn_revnum_t *changed_rev, apr_time_t *changed_date, const char **changed_author, svn_depth_t *depth, const svn_checksum_t **checksum, const char **target, const char **original_repos_relpath, const char **original_root_url, const char **original_uuid, svn_revnum_t *original_revision, svn_wc__db_lock_t **lock, svn_filesize_t *recorded_size, apr_time_t *recorded_time, const char **changelist, svn_boolean_t *conflicted, svn_boolean_t *op_root, svn_boolean_t *have_props, svn_boolean_t *props_mod, svn_boolean_t *have_base, svn_boolean_t *have_more_work, svn_boolean_t *have_work, svn_wc__db_t *db, const char *local_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
[all...]
/freebsd-11.0-release/contrib/subversion/subversion/include/
H A Dsvn_client.h2319 svn_boolean_t conflicted; member in struct:svn_client_status_t
H A Dsvn_wc.h3704 svn_boolean_t conflicted; member in struct:svn_wc_status3_t
[all...]

Completed in 208 milliseconds