Searched refs:merged_prop (Results 1 – 2 of 2) sorted by relevance
906 svn_boolean_t merged_prop = FALSE; in apply_single_prop_add() local931 merged_prop = TRUE; in apply_single_prop_add()937 if (!merged_prop) in apply_single_prop_add()1164 svn_boolean_t merged_prop = FALSE; in apply_single_prop_change() local1201 merged_prop = TRUE; in apply_single_prop_change()1205 if (!merged_prop) in apply_single_prop_change()
346 svn_stream_t *merged_prop; in edit_prop_conflict() local348 SVN_ERR(svn_stream_open_unique(&merged_prop, &file_path, NULL, in edit_prop_conflict()351 SVN_ERR(merge_prop_conflict(merged_prop, base_propval, my_propval, in edit_prop_conflict()356 SVN_ERR(svn_stream_close(merged_prop)); in edit_prop_conflict()