Searched refs:existing_conflict (Results 1 – 2 of 2) sorted by relevance
410 svn_boolean_t existing_conflict; in svn_wc__add_tree_conflict() local420 err = svn_wc__internal_conflicted_p(NULL, NULL, &existing_conflict, in svn_wc__add_tree_conflict()430 else if (existing_conflict) in svn_wc__add_tree_conflict()
1312 const svn_wc_conflict_description2_t *existing_conflict, in record_tree_conflict() argument1404 if (existing_conflict != NULL && existing_conflict->src_left_version) in record_tree_conflict()1405 left = existing_conflict->src_left_version; in record_tree_conflict()1416 if (existing_conflict) in record_tree_conflict()