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

/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
H A Dinfo.c51 apr_array_header_t *new_conflicts
55 APR_ARRAY_PUSH(new_conflicts, svn_wc_conflict_description2_t *)
61 new_info->conflicts = new_conflicts;
50 apr_array_header_t *new_conflicts local
H A Dconflicts.c2673 svn_skel_t *new_conflicts;
2703 SVN_ERR(svn_wc__db_read_conflict(&new_conflicts, NULL, NULL,
2707 if (new_conflicts)
2711 new_conflicts,
2715 if (!new_conflicts || !tree_conflicted)
2726 new_conflicts,
2736 conflicts = new_conflicts;
2671 svn_skel_t *new_conflicts; local

Completed in 131 milliseconds