Home
last modified time | relevance | path

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

/NextBSD/contrib/subversion/subversion/svn/
HDcl-conflicts.c65 { "tree", svn_wc_conflict_kind_tree },
449 if (conflict->kind == svn_wc_conflict_kind_tree) in svn_cl__append_conflict_info_xml()
509 case svn_wc_conflict_kind_tree: in svn_cl__append_conflict_info_xml()
HDinfo-cmd.c634 case svn_wc_conflict_kind_tree: in print_info()
HDnotify.c119 case svn_wc_conflict_kind_tree: in svn_cl__conflict_stats_resolved()
HDconflict-callbacks.c1336 else if (desc->kind == svn_wc_conflict_kind_tree) in conflict_func_interactive()
/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDutil.c242 conflict->kind = svn_wc_conflict_kind_tree; in svn_wc_conflict_description_create_tree2()
408 case svn_wc_conflict_kind_tree: in svn_wc__cd2_to_cd()
HDtree_conflicts.c506 if (desc->kind == svn_wc_conflict_kind_tree) in svn_wc__get_tree_conflict()
HDentries.c498 if (conflict->kind == svn_wc_conflict_kind_tree) in read_one_entry()
2031 WRITE_ENTRY_ASSERT(conflict->kind == svn_wc_conflict_kind_tree); in write_entry()
HDconflicts.c2993 || (cd->kind == svn_wc_conflict_kind_tree && !cswb->resolve_tree)) in conflict_status_walker()
3019 case svn_wc_conflict_kind_tree: in conflict_status_walker()
HDdeprecated.c4705 conflict->kind = svn_wc_conflict_kind_tree; in svn_wc_conflict_description_create_tree()
/NextBSD/contrib/subversion/subversion/include/
HDsvn_wc.h1643 svn_wc_conflict_kind_tree enumerator
/NextBSD/contrib/subversion/subversion/libsvn_client/
HDdeprecated.c2695 case svn_wc_conflict_kind_tree: in info_from_info2()