Searched refs:base_propval (Results 1 – 3 of 3) sorted by relevance
| /freebsd-13.1/contrib/subversion/subversion/svn/ |
| H A D | conflict-callbacks.c | 218 const svn_string_t *base_propval, in merge_prop_conflict() argument
231 if (base_propval == NULL) in merge_prop_conflict()
232 base_propval = svn_string_create_empty(pool); in merge_prop_conflict()
239 SVN_ERR(svn_diff_mem_string_diff3(&diff, base_propval, in merge_prop_conflict()
244 output, diff, base_propval, in merge_prop_conflict()
266 show_prop_conflict(const svn_string_t *base_propval, in show_prop_conflict() argument
277 SVN_ERR(merge_prop_conflict(output, base_propval, my_propval, their_propval, in show_prop_conflict()
335 const svn_string_t *base_propval, in edit_prop_conflict() argument
351 SVN_ERR(merge_prop_conflict(merged_prop, base_propval, my_propval, in edit_prop_conflict()
1295 const svn_string_t *base_propval; in handle_one_prop_conflict() local
[all …]
|
| /freebsd-13.1/contrib/subversion/subversion/include/ |
| H A D | svn_client.h | 5287 svn_client_conflict_prop_get_propvals(const svn_string_t **base_propval,
|
| /freebsd-13.1/contrib/subversion/subversion/libsvn_client/ |
| H A D | conflicts.c | 13094 svn_client_conflict_prop_get_propvals(const svn_string_t **base_propval, in svn_client_conflict_prop_get_propvals() argument
13111 if (base_propval) in svn_client_conflict_prop_get_propvals()
13112 *base_propval = in svn_client_conflict_prop_get_propvals()
|