/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
H A D | update_editor.c | 1255 svn_skel_t *tree_conflict = svn_wc__conflict_skel_create(pool); 1258 tree_conflict, eb->db, move_src_root_abspath, 1269 SVN_ERR(complete_conflict(tree_conflict, eb, 1278 tree_conflict, 1284 db->edit_conflict = tree_conflict; 1624 svn_skel_t *tree_conflict = NULL; 1745 SVN_ERR(check_tree_conflict(&tree_conflict, eb, local_abspath, 1752 if (tree_conflict != NULL) 1762 tree_conflict); 1774 SVN_ERR(complete_conflict(tree_conflict, e 1251 svn_skel_t *tree_conflict = svn_wc__conflict_skel_create(pool); local 1620 svn_skel_t *tree_conflict = NULL; local 1865 svn_skel_t *tree_conflict = NULL; local 2244 svn_skel_t *tree_conflict = NULL; local 2889 svn_skel_t *tree_conflict = NULL; local 3095 svn_skel_t *tree_conflict = NULL; local 3442 svn_skel_t *tree_conflict = NULL; local [all...] |
H A D | info.c | 512 const svn_wc_conflict_description2_t *tree_conflict; 543 tree_conflict = APR_ARRAY_IDX(conflicts, 0, 546 if (!depth_includes(local_abspath, depth, tree_conflict->local_abspath, 547 tree_conflict->node_kind, iterpool)) 511 const svn_wc_conflict_description2_t *tree_conflict; local
|
H A D | tree_conflicts.c | 478 svn_wc__get_tree_conflict(const svn_wc_conflict_description2_t **tree_conflict, argument 496 *tree_conflict = NULL; 508 *tree_conflict = svn_wc_conflict_description2_dup(desc, result_pool); 513 *tree_conflict = NULL;
|
H A D | conflicts.c | 547 svn_skel_t *tree_conflict; 550 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, 553 SVN_ERR_ASSERT(!tree_conflict); /* ### Use proper error? */ 558 tree_conflict = svn_skel__make_empty_list(result_pool); 571 svn_skel__prepend_str(move_dst_op_root_relpath, tree_conflict, 584 svn_skel__prepend_str(move_src_op_root_relpath, tree_conflict, 590 tree_conflict, result_pool); 593 tree_conflict, result_pool); 597 svn_skel__prepend(markers, tree_conflict); 599 svn_skel__prepend_str(SVN_WC__CONFLICT_KIND_TREE, tree_conflict, 546 svn_skel_t *tree_conflict; local 589 tree_conflict, result_pool); local 592 tree_conflict, result_pool); local 958 svn_skel_t *tree_conflict; local [all...] |
H A D | wc_db_update_move.c | 299 svn_boolean_t tree_conflict; local 302 &tree_conflict, 305 if (tree_conflict) 1481 svn_boolean_t tree_conflict = FALSE; local 1533 tree_conflict = TRUE; 1560 tree_conflict = TRUE; 1575 tree_conflict = TRUE; 1653 svn_node_file, !tree_conflict,
|
H A D | deprecated.c | 2820 (*status)->tree_conflict = svn_wc__cd2_to_cd(tree_conflict2, result_pool); 3285 if (orig_stat->tree_conflict) 3286 new_stat->tree_conflict 3287 = conflict_description_dup(orig_stat->tree_conflict, pool);
|
/freebsd-11-stable/contrib/subversion/subversion/svn/ |
H A D | status.c | 287 svn_client_conflict_t *tree_conflict; 289 SVN_ERR(svn_client_conflict_get(&tree_conflict, local_abspath, 293 &desc, tree_conflict, pool)); 285 svn_client_conflict_t *tree_conflict; local
|
/freebsd-11-stable/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-11-stable/contrib/subversion/subversion/include/ |
H A D | svn_client.h | 7296 svn_wc_conflict_description_t *tree_conflict; 7291 svn_wc_conflict_description_t *tree_conflict; member in struct:svn_info_t
|
H A D | svn_wc.h | 3979 svn_wc_conflict_description_t *tree_conflict; 4009 * 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. 3971 svn_wc_conflict_description_t *tree_conflict; member in struct:svn_wc_status2_t
|
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
H A D | deprecated.c | 2856 info->tree_conflict = svn_wc__cd2_to_cd(conflict, pool);
|