Searched refs:conflict_desc (Results 1 - 1 of 1) sorted by relevance
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | props.c | 515 prop_conflict_new(const svn_string_t **conflict_desc,
627 *conflict_desc = svn_string_create_from_buf(buf, result_pool);
655 *conflict_desc = svn_string_create_from_buf(buf, result_pool);
671 prop_conflict_from_skel(const svn_string_t **conflict_desc,
695 return svn_error_trace(prop_conflict_new(conflict_desc,
734 const svn_string_t *conflict_desc;
738 SVN_ERR(prop_conflict_from_skel(&conflict_desc, scan,
742 SVN_ERR(svn_stream_puts(stream, conflict_desc->data));
786 const svn_string_t *conflict_desc;
803 SVN_ERR(prop_conflict_new(&conflict_desc,
513 prop_conflict_new(const svn_string_t **conflict_desc, const char *propname, const svn_string_t *original, const svn_string_t *mine, const svn_string_t *incoming, const svn_string_t *incoming_base, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
669 prop_conflict_from_skel(const svn_string_t **conflict_desc, const svn_skel_t *skel, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
732 const svn_string_t *conflict_desc; local
784 const svn_string_t *conflict_desc; local
[all...] |
Completed in 160 milliseconds