Searched defs:prop_conflicted (Results 1 – 10 of 10) sorted by relevance
254 svn_boolean_t prop_conflicted; in print_status() local
706 svn_boolean_t *prop_conflicted, in svn_wc__conflict_read_info()1095 svn_boolean_t prop_conflicted; in svn_wc__conflict_create_markers() local1896 svn_boolean_t prop_conflicted; in svn_wc__conflict_invoke_resolver() local2122 svn_boolean_t prop_conflicted; in read_prop_conflict_descs() local2297 svn_boolean_t prop_conflicted; in svn_wc__read_conflicts() local2448 svn_boolean_t prop_conflicted; in resolve_prop_conflict_on_node() local
1270 svn_boolean_t prop_conflicted; in svn_wc_merge5() local1405 svn_boolean_t text_conflicted, prop_conflicted; in svn_wc_merge5() local
533 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; in svn_wc__conflicted_for_update_p() local
217 svn_boolean_t prop_conflicted; in svn_wc_merge_props3() local328 svn_boolean_t prop_conflicted; in svn_wc_merge_props3() local
941 svn_boolean_t prop_conflicted; in read_one_entry() local
504 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; in assemble_status() local
4081 svn_boolean_t prop_conflicted; in fetch_conflict_details() local
354 svn_boolean_t text_conflicted, prop_conflicted; in update_internal() local
831 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; in svn_client__create_status() local