/freebsd-10.0-release/contrib/subversion/subversion/libsvn_wc/ |
H A D | update_editor.c | 1258 svn_skel_t *tree_conflict = svn_wc__conflict_skel_create(pool); 1261 tree_conflict, eb->db, move_src_root_abspath, 1271 SVN_ERR(complete_conflict(tree_conflict, eb, 1279 tree_conflict, 1285 db->edit_conflict = tree_conflict; 1718 svn_skel_t *tree_conflict = NULL; 1843 SVN_ERR(check_tree_conflict(&tree_conflict, eb, local_abspath, 1854 if (tree_conflict != NULL) 1865 tree_conflict); 1869 tree_conflict, 1254 svn_skel_t *tree_conflict = svn_wc__conflict_skel_create(pool); local 1714 svn_skel_t *tree_conflict = NULL; local 1996 svn_skel_t *tree_conflict = NULL; local 2358 svn_skel_t *tree_conflict = NULL; local 3112 svn_skel_t *tree_conflict = NULL; local 3443 svn_skel_t *tree_conflict = NULL; local [all...] |
H A D | info.c | 538 const svn_wc_conflict_description2_t *tree_conflict; 569 tree_conflict = APR_ARRAY_IDX(info->wc_info->conflicts, 0, 572 if (!depth_includes(local_abspath, depth, tree_conflict->local_abspath, 573 tree_conflict->node_kind, iterpool)) 537 const svn_wc_conflict_description2_t *tree_conflict; local
|
H A D | tree_conflicts.c | 476 svn_wc__get_tree_conflict(const svn_wc_conflict_description2_t **tree_conflict, argument 492 *tree_conflict = NULL; 504 *tree_conflict = svn_wc__conflict_description2_dup(desc, 510 *tree_conflict = NULL;
|
H A D | util.c | 451 const svn_wc_conflict_description2_t *tree_conflict; 452 SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, wc_ctx, local_abspath, 454 (*status)->tree_conflict = svn_wc__cd2_to_cd(tree_conflict, result_pool); 450 const svn_wc_conflict_description2_t *tree_conflict; local
|
H A D | conflicts.c | 546 svn_skel_t *tree_conflict; 549 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, 552 SVN_ERR_ASSERT(!tree_conflict); /* ### Use proper error? */ 557 tree_conflict = svn_skel__make_empty_list(result_pool); 569 svn_skel__prepend_str(move_src_op_root_relpath, tree_conflict, 575 tree_conflict, result_pool); 579 tree_conflict, result_pool); 583 svn_skel__prepend(markers, tree_conflict); 585 svn_skel__prepend_str(SVN_WC__CONFLICT_KIND_TREE, tree_conflict, 589 svn_skel__prepend(tree_conflict, conflict_ske 545 svn_skel_t *tree_conflict; local 574 tree_conflict, result_pool); local 578 tree_conflict, result_pool); local 943 svn_skel_t *tree_conflict; local [all...] |
H A D | deprecated.c | 3010 if (orig_stat->tree_conflict) 3011 new_stat->tree_conflict 3012 = conflict_description_dup(orig_stat->tree_conflict, pool);
|
/freebsd-10.0-release/contrib/subversion/subversion/svn/ |
H A D | status.c | 274 const svn_wc_conflict_description2_t *tree_conflict; 275 SVN_ERR(svn_wc__get_tree_conflict(&tree_conflict, ctx->wc_ctx, 277 SVN_ERR_ASSERT(tree_conflict != NULL); 281 &desc, tree_conflict, pool)); 272 const svn_wc_conflict_description2_t *tree_conflict; local
|
/freebsd-10.0-release/contrib/subversion/subversion/include/private/ |
H A D | svn_wc_private.h | 288 /** Set @a *tree_conflict to a newly allocated @c 292 * used to access @a victim_path. Allocate @a *tree_conflict in @a result_pool, 296 svn_wc__get_tree_conflict(const svn_wc_conflict_description2_t **tree_conflict,
|
/freebsd-10.0-release/contrib/subversion/subversion/include/ |
H A D | svn_client.h | 5961 svn_wc_conflict_description_t *tree_conflict; 5955 svn_wc_conflict_description_t *tree_conflict; member in struct:svn_info_t
|
H A D | svn_wc.h | 3847 svn_wc_conflict_description_t *tree_conflict; 3877 * Same as #svn_wc_status2_t, but without the #svn_lock_t 'repos_lock', const char 'url', #svn_revnum_t 'ood_last_cmt_rev', apr_time_t 'ood_last_cmt_date', #svn_node_kind_t 'ood_kind', const char 'ood_last_cmt_author', #svn_wc_conflict_description_t 'tree_conflict', #svn_boolean_t 'file_external', #svn_wc_status_kind 'pristine_text_status', and #svn_wc_status_kind 'pristine_prop_status' fields. 3839 svn_wc_conflict_description_t *tree_conflict; member in struct:svn_wc_status2_t
|
/freebsd-10.0-release/contrib/subversion/subversion/libsvn_client/ |
H A D | deprecated.c | 2612 info->tree_conflict = svn_wc__cd2_to_cd(conflict, pool);
|