Searched refs:resolved_props (Results 1 – 5 of 5) sorted by relevance
| /freebsd-13.1/contrib/subversion/subversion/libsvn_wc/ |
| H A D | questions.c | 370 svn_boolean_t resolved_props = FALSE; in internal_conflicted_p() local
465 resolved_props = TRUE; /* Remove in-db conflict marker */ in internal_conflicted_p()
492 if (resolved_text || resolved_props) in internal_conflicted_p()
502 resolved_props, in internal_conflicted_p()
|
| H A D | wc_db_private.h | 510 svn_boolean_t resolved_props,
|
| H A D | wc_db.h | 1661 svn_boolean_t resolved_props,
|
| H A D | wc_db.c | 6654 svn_boolean_t resolved_props, in svn_wc__db_op_mark_resolved_internal() argument
6710 resolved_props ? "" : NULL, in svn_wc__db_op_mark_resolved_internal()
6744 svn_boolean_t resolved_props, in svn_wc__db_op_mark_resolved() argument
6761 resolved_text, resolved_props, resolved_tree, in svn_wc__db_op_mark_resolved()
|
| /freebsd-13.1/contrib/subversion/subversion/libsvn_client/ |
| H A D | conflicts.c | 85 apr_hash_t *resolved_props; member
6489 svn_hash_sets(conflict->resolved_props, in resolve_prop_conflict()
6490 apr_pstrdup(apr_hash_pool_get(conflict->resolved_props), in resolve_prop_conflict()
6500 svn_hash_sets(conflict->resolved_props, in resolve_prop_conflict()
6501 apr_pstrdup(apr_hash_pool_get(conflict->resolved_props), in resolve_prop_conflict()
12852 option = svn_hash_gets(conflict->resolved_props, propname); in svn_client_conflict_prop_get_resolution()
13264 (*conflict)->resolved_props = apr_hash_make(result_pool); in svn_client_conflict_get()
|