Searched refs:conflict_ignored (Results 1 - 2 of 2) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dupdate_editor.c1165 svn_boolean_t already_conflicted, conflict_ignored;
1179 err = already_in_a_tree_conflict(&already_conflicted, &conflict_ignored,
1188 already_conflicted = conflict_ignored = FALSE;
1238 if (conflict_ignored)
1594 svn_boolean_t *conflict_ignored,
1599 SVN_ERR(svn_wc__conflicted_for_update_p(conflicted, conflict_ignored, db,
1867 svn_boolean_t conflict_ignored = FALSE;
2049 SVN_ERR(node_already_conflicted(&conflicted, &conflict_ignored,
2083 else if (conflict_ignored)
2247 svn_boolean_t conflict_ignored
1161 svn_boolean_t already_conflicted, conflict_ignored; local
1589 node_already_conflicted(svn_boolean_t *conflicted, svn_boolean_t *conflict_ignored, svn_wc__db_t *db, const char *local_abspath, apr_pool_t *scratch_pool) argument
1863 svn_boolean_t conflict_ignored = FALSE; local
2243 svn_boolean_t conflict_ignored = FALSE; local
3093 svn_boolean_t conflict_ignored = FALSE; local
3438 svn_boolean_t conflict_ignored = FALSE; local
[all...]
H A Dquestions.c537 svn_boolean_t conflict_ignored;
540 conflict_ignored_p = &conflict_ignored;
534 svn_boolean_t conflict_ignored; local

Completed in 112 milliseconds