Searched refs:conflict_ignored (Results 1 – 2 of 2) sorted by relevance
1161 svn_boolean_t already_conflicted, conflict_ignored; in open_root() local1175 err = already_in_a_tree_conflict(&already_conflicted, &conflict_ignored, in open_root()1184 already_conflicted = conflict_ignored = FALSE; in open_root()1234 if (conflict_ignored) in open_root()1590 svn_boolean_t *conflict_ignored, in node_already_conflicted() argument1595 SVN_ERR(svn_wc__conflicted_for_update_p(conflicted, conflict_ignored, db, in node_already_conflicted()1863 svn_boolean_t conflict_ignored = FALSE; in add_directory() local2045 SVN_ERR(node_already_conflicted(&conflicted, &conflict_ignored, in add_directory()2079 else if (conflict_ignored) in add_directory()2243 svn_boolean_t conflict_ignored = FALSE; in open_directory() local[all …]
534 svn_boolean_t conflict_ignored; in svn_wc__conflicted_for_update_p() local537 conflict_ignored_p = &conflict_ignored; in svn_wc__conflicted_for_update_p()