Lines Matching refs:tree_conflict
546 svn_skel_t *tree_conflict; in svn_wc__conflict_skel_add_tree_conflict() local
549 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_skel_add_tree_conflict()
552 SVN_ERR_ASSERT(!tree_conflict); /* ### Use proper error? */ in svn_wc__conflict_skel_add_tree_conflict()
557 tree_conflict = svn_skel__make_empty_list(result_pool); in svn_wc__conflict_skel_add_tree_conflict()
570 svn_skel__prepend_str(move_dst_op_root_relpath, tree_conflict, in svn_wc__conflict_skel_add_tree_conflict()
583 svn_skel__prepend_str(move_src_op_root_relpath, tree_conflict, in svn_wc__conflict_skel_add_tree_conflict()
589 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
592 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
596 svn_skel__prepend(markers, tree_conflict); in svn_wc__conflict_skel_add_tree_conflict()
598 svn_skel__prepend_str(SVN_WC__CONFLICT_KIND_TREE, tree_conflict, in svn_wc__conflict_skel_add_tree_conflict()
602 svn_skel__prepend(tree_conflict, conflict_skel->children->next); in svn_wc__conflict_skel_add_tree_conflict()
958 svn_skel_t *tree_conflict; in svn_wc__conflict_read_tree_conflict() local
962 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_read_tree_conflict()
965 if (!tree_conflict) in svn_wc__conflict_read_tree_conflict()
968 c = tree_conflict->children; in svn_wc__conflict_read_tree_conflict()