Home
last modified time | relevance | path

Searched refs:text_conflicted (Results 1 – 11 of 11) sorted by relevance

/NextBSD/contrib/subversion/subversion/svn/
HDstatus.c253 svn_boolean_t text_conflicted; in print_status() local
261 err = svn_wc_conflicted_p3(&text_conflicted, in print_status()
269 text_conflicted = FALSE; in print_status()
278 text_conflicted = FALSE; in print_status()
296 else if (text_conflicted) in print_status()
/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDmerge.c1269 svn_boolean_t text_conflicted; in svn_wc_merge5() local
1273 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted, in svn_wc_merge5()
1281 if (text_conflicted || prop_conflicted || tree_conflicted) in svn_wc_merge5()
1405 svn_boolean_t text_conflicted, prop_conflicted; in svn_wc_merge5() local
1416 &text_conflicted, &prop_conflicted, NULL, in svn_wc_merge5()
1422 && ! text_conflicted) in svn_wc_merge5()
HDquestions.c533 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; in svn_wc__conflicted_for_update_p() local
539 SVN_ERR(internal_conflicted_p(tree_only ? NULL: &text_conflicted, in svn_wc__conflicted_for_update_p()
546 *conflicted_p = text_conflicted || prop_conflicted || tree_conflicted; in svn_wc__conflicted_for_update_p()
HDconflicts.c688 svn_boolean_t *text_conflicted, in svn_wc__conflict_read_info() argument
737 if (text_conflicted) in svn_wc__conflict_read_info()
743 *text_conflicted = (c_skel != NULL); in svn_wc__conflict_read_info()
1844 svn_boolean_t text_conflicted; in svn_wc__conflict_invoke_resolver() local
1853 &text_conflicted, &prop_conflicted, in svn_wc__conflict_invoke_resolver()
1945 if (text_conflicted) in svn_wc__conflict_invoke_resolver()
2247 svn_boolean_t text_conflicted; in svn_wc__read_conflicts() local
2274 SVN_ERR(svn_wc__conflict_read_info(&operation, &locations, &text_conflicted, in svn_wc__read_conflicts()
2296 if (text_conflicted && !only_tree_conflict) in svn_wc__read_conflicts()
HDconflicts.h304 svn_boolean_t *text_conflicted,
HDprops.c216 svn_boolean_t text_conflicted; in svn_wc_merge_props3() local
220 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted, in svn_wc_merge_props3()
228 if (text_conflicted || prop_conflicted || tree_conflicted) in svn_wc_merge_props3()
HDwc_db_update_move.c2290 svn_boolean_t text_conflicted; in fetch_conflict_details() local
2305 &text_conflicted, &prop_conflicted, in fetch_conflict_details()
2311 if (text_conflicted || prop_conflicted || !tree_conflicted) in fetch_conflict_details()
HDentries.c940 svn_boolean_t text_conflicted; in read_one_entry() local
946 SVN_ERR(svn_wc__conflict_read_info(NULL, NULL, &text_conflicted, in read_one_entry()
951 if (text_conflicted) in read_one_entry()
HDstatus.c503 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; in assemble_status() local
507 SVN_ERR(svn_wc__internal_conflicted_p(&text_conflicted, &prop_conflicted, in assemble_status()
511 if (!text_conflicted && !prop_conflicted && !tree_conflicted) in assemble_status()
/NextBSD/contrib/subversion/subversion/libsvn_client/
HDstatus.c751 svn_boolean_t text_conflicted, prop_conflicted, tree_conflicted; in svn_client__create_status() local
756 SVN_ERR(svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted, in svn_client__create_status()
760 if (text_conflicted) in svn_client__create_status()
767 if (text_conflicted || prop_conflicted) in svn_client__create_status()
HDupdate.c272 svn_boolean_t text_conflicted, prop_conflicted; in update_internal() local
277 err = svn_wc_conflicted_p3(&text_conflicted, &prop_conflicted, in update_internal()
286 if (!err && (text_conflicted || prop_conflicted)) in update_internal()