pub unsafe extern "C" fn svn_wc_merge_prop_diffs(
state: *mut svn_wc_notify_state_t,
path: *const c_char,
adm_access: *mut svn_wc_adm_access_t,
propchanges: *const apr_array_header_t,
base_merge: svn_boolean_t,
dry_run: svn_boolean_t,
pool: *mut apr_pool_t,
) -> *mut svn_error_t
Expand description
Similar to svn_wc_merge_props(), but no baseprops are given. Instead, it’s assumed that the incoming propchanges are based against the working copy’s own baseprops. While this assumption is correct for ‘svn update’, it’s incorrect for ‘svn merge’, and can cause flawed behavior. (See issue #2035.)
@since The base_merge option is not supported since 1.7. @deprecated Provided for backward compatibility with the 1.2 API. Replaced by svn_wc_merge_props().