pub unsafe extern "C" fn svn_wc_merge_props2(
state: *mut svn_wc_notify_state_t,
path: *const c_char,
adm_access: *mut svn_wc_adm_access_t,
baseprops: *mut apr_hash_t,
propchanges: *const apr_array_header_t,
base_merge: svn_boolean_t,
dry_run: svn_boolean_t,
conflict_func: svn_wc_conflict_resolver_func_t,
conflict_baton: *mut c_void,
pool: *mut apr_pool_t,
) -> *mut svn_error_t
Expand description
Similar to svn_wc_merge_props3, but takes an access baton and relative path, no cancel_function, and no left and right version.
This function has the @a base_merge parameter which (when TRUE) will apply @a propchanges to this node’s pristine set of properties. This functionality is not supported since API version 1.7 and will give an error if requested (unless @a dry_run is TRUE). For details see ‘notes/api-errata/1.7/wc006.txt’.
Uses a svn_wc_conflict_resolver_func_t conflict resolver instead of a svn_wc_conflict_resolver_func2_t.
For compatibility reasons this function returns #SVN_ERR_UNVERSIONED_RESOURCE, when svn_wc_merge_props3 would return either #SVN_ERR_WC_PATH_NOT_FOUND or #SVN_ERR_WC_PATH_UNEXPECTED_STATUS.
@since New in 1.5. The base_merge option is not supported since 1.7. @deprecated Provided for backward compatibility with the 1.6 API.