Home
last modified time | relevance | path

Searched refs:accept_which (Results 1 – 5 of 5) sorted by relevance

/freebsd-13.1/contrib/subversion/subversion/svn/
H A Dresolve-cmd.c45 svn_cl__accept_t accept_which; member
64 cwb->accept_which, cwb->editor_cmd, in conflict_walker()
95 cwb.accept_which = opt_state->accept_which; in svn_cl__walk_conflicts()
123 conflict, opt_state->accept_which, in svn_cl__walk_conflicts()
184 if (opt_state->accept_which == svn_cl__accept_unspecified) in svn_cl__resolve()
194 if (opt_state->accept_which == svn_cl__accept_unspecified && in svn_cl__resolve()
200 else if (opt_state->accept_which == svn_cl__accept_postpone || in svn_cl__resolve()
201 opt_state->accept_which == svn_cl__accept_edit || in svn_cl__resolve()
202 opt_state->accept_which == svn_cl__accept_launch) in svn_cl__resolve()
H A Dmerge-cmd.c155 svn_cl__accept_t accept_which; member
180 switch (b->accept_which) in conflict_func_merge_cmd()
520 if (opt_state->accept_which != svn_cl__accept_unspecified) in svn_cl__merge()
524 b->accept_which = opt_state->accept_which; in svn_cl__merge()
H A Dconflict-callbacks.c2033 svn_cl__accept_t accept_which, in svn_cl__resolve_conflict() argument
2055 if (accept_which == svn_cl__accept_unspecified) in svn_cl__resolve_conflict()
2059 else if (accept_which == svn_cl__accept_postpone) in svn_cl__resolve_conflict()
2063 else if (accept_which == svn_cl__accept_base) in svn_cl__resolve_conflict()
2067 else if (accept_which == svn_cl__accept_working) in svn_cl__resolve_conflict()
2092 else if (accept_which == svn_cl__accept_mine_conflict) in svn_cl__resolve_conflict()
2135 else if (accept_which == svn_cl__accept_theirs_full) in svn_cl__resolve_conflict()
2139 else if (accept_which == svn_cl__accept_mine_full) in svn_cl__resolve_conflict()
2143 else if (accept_which == svn_cl__accept_edit) in svn_cl__resolve_conflict()
2179 else if (accept_which == svn_cl__accept_launch) in svn_cl__resolve_conflict()
[all …]
H A Dsvn.c2090 opt_state.accept_which = svn_cl__accept_unspecified; in sub_main()
2526 opt_state.accept_which = svn_cl__accept_from_word(utf8_opt_arg); in sub_main()
2527 if (opt_state.accept_which == svn_cl__accept_invalid) in sub_main()
3190 if (opt_state.accept_which == svn_cl__accept_edit) in sub_main()
3197 if (opt_state.accept_which == svn_cl__accept_launch) in sub_main()
3208 if (opt_state.accept_which == svn_cl__accept_unspecified) in sub_main()
3209 opt_state.accept_which = svn_cl__accept_recommended; in sub_main()
3227 if (opt_state.accept_which == svn_cl__accept_unspecified) in sub_main()
3228 opt_state.accept_which = svn_cl__accept_postpone; in sub_main()
H A Dcl.h241 svn_cl__accept_t accept_which; /* how to handle conflicts */ member
513 svn_cl__accept_t accept_which,