Searched refs:did_merge (Results 1 - 1 of 1) sorted by relevance
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
H A D | props.c | 887 svn_boolean_t *did_merge, 904 *did_merge = TRUE; 935 *did_merge = TRUE; 963 svn_boolean_t *did_merge, 984 *did_merge = TRUE; 1001 *did_merge = TRUE; 1021 svn_boolean_t *did_merge, 1039 *did_merge = TRUE; 1052 *did_merge = TRUE; 1094 *did_merge 883 apply_single_prop_add(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const char *propname, const svn_string_t *pristine_val, const svn_string_t *new_val, const svn_string_t *working_val, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 959 apply_single_prop_delete(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const svn_string_t *base_val, const svn_string_t *old_val, const svn_string_t *working_val) argument 1017 apply_single_mergeinfo_prop_change(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const svn_string_t *base_val, const svn_string_t *old_val, const svn_string_t *new_val, const svn_string_t *working_val, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 1106 apply_single_generic_prop_change(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const svn_string_t *old_val, const svn_string_t *new_val, const svn_string_t *working_val) argument 1153 apply_single_prop_change(const svn_string_t **result_val, svn_boolean_t *conflict_remains, svn_boolean_t *did_merge, const char *propname, const svn_string_t *base_val, const svn_string_t *old_val, const svn_string_t *new_val, const svn_string_t *working_val, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 1273 svn_boolean_t did_merge = FALSE; local [all...] |
Completed in 110 milliseconds