Searched refs:conflicted_props (Results 1 – 2 of 2) sorted by relevance
2068 apr_hash_t *conflicted_props; in read_prop_conflict_descs() local2084 &conflicted_props, in read_prop_conflict_descs()2091 if (apr_hash_count(conflicted_props) == 0) in read_prop_conflict_descs()2120 for (hi = apr_hash_first(scratch_pool, conflicted_props); in read_prop_conflict_descs()2381 apr_hash_t *conflicted_props; in resolve_prop_conflict_on_node() local2400 &their_props, &conflicted_props, in resolve_prop_conflict_on_node()2404 if (!conflicted_props) in resolve_prop_conflict_on_node()2419 && !svn_hash_gets(conflicted_props, conflicted_propname)) in resolve_prop_conflict_on_node()2493 apply_on_props = conflicted_props; in resolve_prop_conflict_on_node()
751 apr_hash_t *conflicted_props; in svn_wc__create_prejfile() local767 &conflicted_props, in svn_wc__create_prejfile()780 for (hi = apr_hash_first(scratch_pool, conflicted_props); in svn_wc__create_prejfile()