Searched refs:conflict_desc (Results 1 – 1 of 1) sorted by relevance
513 prop_conflict_new(const svn_string_t **conflict_desc, in prop_conflict_new() argument625 *conflict_desc = svn_string_create_from_buf(buf, result_pool); in prop_conflict_new()653 *conflict_desc = svn_string_create_from_buf(buf, result_pool); in prop_conflict_new()669 prop_conflict_from_skel(const svn_string_t **conflict_desc, in prop_conflict_from_skel() argument693 return svn_error_trace(prop_conflict_new(conflict_desc, in prop_conflict_from_skel()732 const svn_string_t *conflict_desc; in svn_wc__create_prejfile() local736 SVN_ERR(prop_conflict_from_skel(&conflict_desc, scan, in svn_wc__create_prejfile()740 SVN_ERR(svn_stream_puts(stream, conflict_desc->data)); in svn_wc__create_prejfile()784 const svn_string_t *conflict_desc; in svn_wc__create_prejfile() local801 SVN_ERR(prop_conflict_new(&conflict_desc, in svn_wc__create_prejfile()[all …]