Home
last modified time | relevance | path

Searched refs:conflict_choice (Results 1 – 7 of 7) sorted by relevance

/NextBSD/contrib/subversion/subversion/svn/
HDresolve-cmd.c49 svn_wc_conflict_choice_t conflict_choice; in svn_cl__resolve() local
59 conflict_choice = svn_wc_conflict_choose_merged; in svn_cl__resolve()
62 conflict_choice = svn_wc_conflict_choose_base; in svn_cl__resolve()
65 conflict_choice = svn_wc_conflict_choose_theirs_conflict; in svn_cl__resolve()
68 conflict_choice = svn_wc_conflict_choose_mine_conflict; in svn_cl__resolve()
71 conflict_choice = svn_wc_conflict_choose_theirs_full; in svn_cl__resolve()
74 conflict_choice = svn_wc_conflict_choose_mine_full; in svn_cl__resolve()
80 conflict_choice = svn_wc_conflict_choose_unspecified; in svn_cl__resolve()
113 opt_state->depth, conflict_choice, in svn_cl__resolve()
/NextBSD/contrib/subversion/subversion/libsvn_client/
HDresolved.c109 svn_wc_conflict_choice_t conflict_choice, in svn_client_resolve() argument
133 conflict_choice, in svn_client_resolve()
/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDconflicts.c1824 svn_wc_conflict_choice_t conflict_choice,
2370 svn_wc_conflict_choice_t conflict_choice, in resolve_prop_conflict_on_node() argument
2444 switch (conflict_choice) in resolve_prop_conflict_on_node()
2599 svn_wc_conflict_choice_t conflict_choice, in resolve_tree_conflict_on_node() argument
2634 if (conflict_choice == svn_wc_conflict_choose_merged) in resolve_tree_conflict_on_node()
2653 else if (conflict_choice == svn_wc_conflict_choose_mine_conflict) in resolve_tree_conflict_on_node()
2738 if (conflict_choice == svn_wc_conflict_choose_mine_conflict) in resolve_tree_conflict_on_node()
2766 else if (conflict_choice == svn_wc_conflict_choose_merged) in resolve_tree_conflict_on_node()
2797 if (conflict_choice == svn_wc_conflict_choose_merged) in resolve_tree_conflict_on_node()
2805 else if (conflict_choice == svn_wc_conflict_choose_mine_conflict) in resolve_tree_conflict_on_node()
[all …]
HDdeprecated.c1192 svn_wc_conflict_choice_t conflict_choice, in svn_wc_resolved_conflict4() argument
1212 conflict_choice, in svn_wc_resolved_conflict4()
1271 svn_wc_conflict_choice_t conflict_choice, in svn_wc_resolved_conflict3() argument
/NextBSD/contrib/subversion/subversion/include/private/
HDsvn_wc_private.h1740 svn_wc_conflict_choice_t conflict_choice,
/NextBSD/contrib/subversion/subversion/include/
HDsvn_wc.h5061 svn_wc_conflict_choice_t conflict_choice,
5083 svn_wc_conflict_choice_t conflict_choice,
5105 svn_wc_conflict_choice_t conflict_choice,
HDsvn_client.h4431 svn_wc_conflict_choice_t conflict_choice,