Searched refs:their_old_props (Results 1 - 2 of 2) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.h196 const apr_hash_t *their_old_props,
351 apr_hash_t **their_old_props,
H A Dconflicts.c422 const apr_hash_t *their_old_props,
468 if (their_old_props)
470 SVN_ERR(svn_skel__unparse_proplist(&props, their_old_props,
860 apr_hash_t **their_old_props,
917 if (their_old_props)
920 *their_old_props = apr_hash_make(result_pool);
922 SVN_ERR(svn_skel__parse_proplist(their_old_props, c, result_pool));
2118 apr_hash_t *their_old_props;
2134 &their_old_props,
2197 old_value = svn_hash_gets(their_old_props, propnam
416 svn_wc__conflict_skel_add_prop_conflict(svn_skel_t *conflict_skel, svn_wc__db_t *db, const char *wri_abspath, const char *marker_abspath, const apr_hash_t *mine_props, const apr_hash_t *their_old_props, const apr_hash_t *their_props, const apr_hash_t *conflicted_prop_names, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
857 svn_wc__conflict_read_prop_conflict(const char **marker_abspath, apr_hash_t **mine_props, apr_hash_t **their_old_props, apr_hash_t **their_props, apr_hash_t **conflicted_prop_names, svn_wc__db_t *db, const char *wri_abspath, const svn_skel_t *conflict_skel, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2117 apr_hash_t *their_old_props; local
2441 apr_hash_t *their_old_props; local
[all...]

Completed in 155 milliseconds