Searched refs:conflict (Results 1 - 25 of 113) sorted by relevance

12345

/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
H A Dutil.c196 svn_wc_conflict_description2_t *conflict;
200 conflict = apr_pcalloc(result_pool, sizeof(*conflict));
201 conflict->local_abspath = apr_pstrdup(result_pool, local_abspath);
202 conflict->node_kind = svn_node_file;
203 conflict->kind = svn_wc_conflict_kind_text;
204 conflict->action = svn_wc_conflict_action_edit;
205 conflict->reason = svn_wc_conflict_reason_edited;
206 return conflict;
215 svn_wc_conflict_description2_t *conflict;
195 svn_wc_conflict_description2_t *conflict; local
214 svn_wc_conflict_description2_t *conflict; local
235 svn_wc_conflict_description2_t *conflict; local
278 svn_wc_conflict_description2_dup(const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
359 svn_wc__cd2_to_cd(const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool) argument
[all...]
H A Dtree_conflicts.h46 * Each tree conflict is identified by the path of the file
48 * We call this file or directory the "victim" of the tree conflict.
51 * modified by the user is a victim of a tree conflict.
53 * For now, tree conflict victims are always direct children of the
54 * directory in which the tree conflict is recorded.
57 * If a directory has tree conflicts, the "tree-conflict-data" field
58 * in the entry for the directory contains one or more tree conflict
65 const svn_wc_conflict_description2_t *conflict,
76 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict,
H A Dtree_conflicts.c2 * tree_conflicts.c: Storage of tree conflict descriptions in the WC.
109 || !svn_skel__matches_atom(skel->children, "conflict"))
137 _("Unknown enumeration value in tree conflict "
146 /* Parse the conflict info fields from SKEL into *VERSION_INFO. */
161 _("Invalid version info in tree conflict "
200 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict, argument
219 _("Invalid conflict info '%s' in tree conflict "
230 _("Empty 'victim' field in tree conflict "
238 _("Invalid 'node_kind' field in tree conflict descriptio
332 svn_wc__serialize_conflict(svn_skel_t **skel, const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
406 svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx, const svn_wc_conflict_description2_t *conflict, apr_pool_t *scratch_pool) argument
[all...]
H A Dwc_db.h424 If CONFLICT is not NULL, then it describes a conflict for this node. The
450 const svn_skel_t *conflict,
469 svn_skel_t *conflict,
492 If CONFLICT is not NULL, then it describes a conflict for this node. The
528 const svn_skel_t *conflict,
550 If CONFLICT is not NULL, then it describes a conflict for this node. The
611 const svn_skel_t *conflict,
628 If CONFLICT is not NULL, then it describes a conflict for this node. The
645 const svn_skel_t *conflict,
659 If CONFLICT is not NULL, then it describes a conflict fo
[all...]
H A Dwc_db_update_move.c2 * wc_db_update_move.c : updating moves during tree-conflict resolution
37 * and flags a tree-conflict on the moved-away root node.
53 * source and may have introduced a tree-conflict since the source and
84 * changes, a tree conflict is raised, and the former BASE tree which
85 * the local changes were based on (the tree conflict victim) is re-added
260 /* Per node flags for tree conflict collection */
282 a conflict and/or work items. */
291 svn_skel_t *conflict,
297 if (conflict)
303 db, wcroot->abspath, conflict,
284 update_move_list_add(svn_wc__db_wcroot_t *wcroot, const char *local_relpath, svn_wc__db_t *db, svn_wc_notify_action_t action, svn_node_kind_t kind, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_skel_t *conflict, svn_skel_t *work_item, apr_pool_t *scratch_pool) argument
407 svn_skel_t *conflict; local
624 svn_skel_t *conflict; local
730 svn_skel_t *conflict = NULL; local
861 svn_skel_t *conflict = NULL; local
920 svn_skel_t *conflict = NULL; local
1011 svn_skel_t *conflict = NULL; local
1681 svn_skel_t *conflict = NULL; local
1813 svn_skel_t *conflict = NULL; local
2918 svn_skel_t *conflict; local
3690 svn_skel_t *conflict; local
3835 svn_skel_t *conflict; local
4185 svn_skel_t *conflict; local
4235 svn_skel_t *conflict; local
[all...]
H A Ddeprecated.c2617 const svn_wc_conflict_description2_t *conflict,
2623 svn_wc_conflict_description_t *cd = svn_wc__cd2_to_cd(conflict,
2891 /* The entry says there was a conflict, but the user might have
3226 conflict_description_dup(const svn_wc_conflict_description_t *conflict,
3234 *new_conflict = *conflict;
3236 if (conflict->path)
3237 new_conflict->path = apr_pstrdup(pool, conflict->path);
3238 if (conflict->property_name)
3239 new_conflict->property_name = apr_pstrdup(pool, conflict->property_name);
3240 if (conflict
2615 conflict_func_1to2_wrapper(svn_wc_conflict_result_t **result, const svn_wc_conflict_description2_t *conflict, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3225 conflict_description_dup(const svn_wc_conflict_description_t *conflict, apr_pool_t *pool) argument
4716 svn_wc_conflict_description_t *conflict; local
4735 svn_wc_conflict_description_t *conflict; local
4756 svn_wc_conflict_description_t *conflict; local
4870 svn_wc__conflict_description2_dup(const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
[all...]
/freebsd-11-stable/contrib/subversion/subversion/svn/
H A Dcl-conflicts.h47 * description of a property conflict described by @a conflict.
54 svn_client_conflict_t *conflict,
59 * description of a tree conflict described by @a conflict.
66 svn_client_conflict_t *conflict,
70 for other conflict types */
80 * Append to @a str an XML representation of the conflict data
81 * for @a conflict, in a format suitable for 'svn info --xml'.
86 svn_client_conflict_t *conflict,
[all...]
H A Dcl-conflicts.c61 /* Return a localised string representation of the local part of a conflict;
154 conflict; NULL for non-localised odd cases. */
206 conflict. */
224 svn_client_conflict_t *conflict,
231 switch (svn_client_conflict_get_local_change(conflict))
250 svn_client_conflict_get_local_change(conflict)));
253 switch (svn_client_conflict_get_incoming_change(conflict))
269 svn_client_conflict_get_incoming_change(conflict)));
276 svn_client_conflict_get_operation(conflict)));
283 svn_client_conflict_t *conflict,
222 svn_cl__get_human_readable_prop_conflict_description( const char **desc, svn_client_conflict_t *conflict, apr_pool_t *pool) argument
281 svn_cl__get_human_readable_tree_conflict_description( const char **desc, svn_client_conflict_t *conflict, apr_pool_t *pool) argument
405 append_tree_conflict_info_xml(svn_stringbuf_t *str, svn_client_conflict_t *conflict, apr_pool_t *pool) argument
473 svn_cl__append_conflict_info_xml(svn_stringbuf_t *str, svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument
[all...]
H A Dconflict-callbacks.c2 * conflict-callbacks.c: conflict resolution callbacks specific to the
91 * corresponding to the conflict described in CONFLICT. */
93 show_diff(svn_client_conflict_t *conflict,
110 conflict, pool, pool));
125 if (svn_client_conflict_get_operation(conflict) == svn_wc_operation_merge)
172 /* Print on stdout just the conflict hunks of a diff among the 'base', 'their'
175 show_conflicts(svn_client_conflict_t *conflict,
189 conflict, pool, pool));
196 ### svn_wc__merge_internal in the conflict descriptio
92 show_diff(svn_client_conflict_t *conflict, const char *merged_abspath, const char *path_prefix, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
174 show_conflicts(svn_client_conflict_t *conflict, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument
572 find_option_by_builtin(client_option_t **out, svn_client_conflict_t *conflict, const resolver_option_t *options, svn_client_conflict_option_t *builtin_option, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
763 build_text_conflict_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, svn_boolean_t is_binary, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
826 mark_conflict_resolved(svn_client_conflict_t *conflict, svn_client_conflict_option_id_t option_id, svn_boolean_t text_conflicted, const char *propname, svn_boolean_t tree_conflicted, const char *path_prefix, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
873 handle_text_conflict(svn_boolean_t *resolved, svn_boolean_t *postponed, svn_boolean_t *quit, svn_boolean_t *printed_description, svn_client_conflict_t *conflict, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, const char *editor_cmd, apr_hash_t *config, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
1225 build_prop_conflict_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1279 handle_one_prop_conflict(svn_client_conflict_option_t **option, svn_boolean_t *quit, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, const char *editor_cmd, apr_hash_t *config, svn_client_conflict_t *conflict, const char *propname, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1404 handle_prop_conflicts(svn_boolean_t *resolved, svn_boolean_t *postponed, svn_boolean_t *quit, const svn_string_t **merged_value, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, const char *editor_cmd, apr_hash_t *config, svn_client_conflict_t *conflict, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1473 build_tree_conflict_options( apr_array_header_t **options, apr_array_header_t **possible_moved_to_repos_relpaths, apr_array_header_t **possible_moved_to_abspaths, svn_boolean_t *all_options_are_dumb, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1750 handle_tree_conflict(svn_boolean_t *resolved, svn_boolean_t *postponed, svn_boolean_t *quit, svn_boolean_t *printed_description, svn_client_conflict_t *conflict, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
1973 resolve_conflict_interactively(svn_boolean_t *resolved, svn_boolean_t *postponed, svn_boolean_t *quit, svn_boolean_t *external_failed, svn_boolean_t *printed_summary, svn_boolean_t *printed_description, svn_client_conflict_t *conflict, const char *editor_cmd, apr_hash_t *config, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
2029 svn_cl__resolve_conflict(svn_boolean_t *quit, svn_boolean_t *external_failed, svn_boolean_t *printed_summary, svn_client_conflict_t *conflict, svn_cl__accept_t accept_which, const char *editor_cmd, const char *path_prefix, svn_cmdline_prompt_baton_t *pb, svn_cl__conflict_stats_t *conflict_stats, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
[all...]
H A Dresolve-cmd.c59 conflict_walker(void *baton, svn_client_conflict_t *conflict,
65 &cwb->printed_summary, conflict,
111 svn_client_conflict_t *conflict;
121 SVN_ERR(svn_client_conflict_get(&conflict, local_abspath, ctx,
125 conflict, opt_state->accept_which,
141 * ### being re-arranged during tree conflict resolution. */
57 conflict_walker(void *baton, svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument
109 svn_client_conflict_t *conflict; local
/freebsd-11-stable/contrib/ntp/ntpd/
H A Dntpd-opts.h164 # warning undefining IPV4 due to option name conflict
168 # warning undefining IPV6 due to option name conflict
172 # warning undefining AUTHREQ due to option name conflict
176 # warning undefining AUTHNOREQ due to option name conflict
180 # warning undefining BCASTSYNC due to option name conflict
184 # warning undefining CONFIGFILE due to option name conflict
188 # warning undefining DEBUG_LEVEL due to option name conflict
192 # warning undefining SET_DEBUG_LEVEL due to option name conflict
196 # warning undefining DRIFTFILE due to option name conflict
200 # warning undefining PANICGATE due to option name conflict
[all...]
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
H A Dconflicts.c2 * conflicts.c: conflict resolver implementation
58 /* Describe a tree conflict. */
61 svn_client_conflict_t *conflict,
66 /* Get more information about a tree conflict.
69 svn_client_conflict_t *conflict,
78 /* Indicate which options were chosen to resolve a text or tree conflict
89 /* Ask a tree conflict to describe itself. */
95 /* Ask a tree conflict to find out more information about itself
101 * when describing a tree conflict. */
105 /* The pool this conflict wa
132 svn_client_conflict_t *conflict; member in struct:svn_client_conflict_option_t
199 add_legacy_desc_to_conflict(const svn_wc_conflict_description2_t *desc, svn_client_conflict_t *conflict, apr_pool_t *result_pool) argument
1114 describe_local_file_node_change(const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
1338 describe_local_dir_node_change(const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2215 find_revision_for_suspected_deletion(svn_revnum_t *deleted_rev, const char **deleted_rev_author, svn_node_kind_t *replacing_node_kind, struct apr_array_header_t **moves, svn_client_conflict_t *conflict, const char *deleted_basename, const char *parent_repos_relpath, svn_revnum_t start_rev, svn_revnum_t end_rev, const char *related_repos_relpath, svn_revnum_t related_peg_rev, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2408 find_related_node(const char **related_repos_relpath, svn_revnum_t *related_peg_rev, const char *younger_related_repos_relpath, svn_revnum_t younger_related_peg_rev, const char *older_repos_relpath, svn_revnum_t older_peg_rev, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
2787 conflict_tree_get_details_local_missing(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
3102 describe_local_none_node_change(const char **description, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3195 conflict_tree_get_local_description_generic(const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3230 conflict_tree_get_description_local_missing(const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3498 svn_client_conflict_prop_get_description(const char **description, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
3560 conflict_tree_get_incoming_description_generic( const char **incoming_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
4780 conflict_tree_get_description_incoming_delete( const char **incoming_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
5003 init_wc_move_targets(struct conflict_tree_incoming_delete_details *details, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
5083 conflict_tree_get_details_incoming_delete(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
5280 conflict_tree_get_details_incoming_add(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
5763 conflict_tree_get_description_incoming_add( const char **incoming_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
5962 conflict_tree_get_details_incoming_edit(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6205 conflict_tree_get_description_incoming_edit( const char **incoming_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
6362 svn_client_conflict_tree_get_description( const char **incoming_change_description, const char **local_change_description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
6392 resolve_postpone(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6402 resolve_text_conflict(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6441 resolve_prop_conflict(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6519 resolve_accept_current_wc_state(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6566 resolve_update_break_moved_away(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6599 resolve_update_raise_moved_away(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6632 resolve_update_moved_away_node(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6672 verify_local_state_for_incoming_add_upon_update( svn_client_conflict_t *conflict, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6814 resolve_incoming_add_ignore(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
6883 resolve_merge_incoming_added_file_text_update( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
7025 resolve_merge_incoming_added_file_text_merge( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
7154 resolve_merge_incoming_added_file_replace_and_merge( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
7363 svn_wc_conflict_description2_t *conflict; local
7820 resolve_merge_incoming_added_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
7930 resolve_update_incoming_added_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
7992 merge_incoming_added_dir_replace(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, svn_boolean_t merge_dirs, apr_pool_t *scratch_pool) argument
8148 resolve_merge_incoming_added_dir_replace(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
8162 resolve_merge_incoming_added_dir_replace_and_merge( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
8178 ensure_local_edit_vs_incoming_deletion_copied_state( struct conflict_tree_incoming_delete_details *details, svn_wc_operation_t operation, const char *wcroot_abspath, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
8289 verify_local_state_for_incoming_delete(svn_client_conflict_t *conflict, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
8364 resolve_incoming_delete_ignore(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
8410 resolve_incoming_delete_accept(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
8479 resolve_incoming_move_file_text_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
8812 resolve_both_moved_file_text_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
9016 resolve_both_moved_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
9165 resolve_both_moved_dir_move_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
9324 resolve_incoming_move_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
9558 resolve_local_move_file_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
9738 resolve_local_move_dir_merge(svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
9858 assert_text_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument
9872 assert_prop_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument
9887 assert_tree_conflict(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument
9905 add_resolution_option(apr_array_header_t *options, svn_client_conflict_t *conflict, svn_client_conflict_option_id_t id, const char *label, const char *description, conflict_option_resolve_func_t resolve_func) argument
9928 svn_client_conflict_text_get_resolution_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
10013 svn_client_conflict_prop_get_resolution_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
10071 configure_option_accept_current_wc_state(svn_client_conflict_t *conflict, apr_array_header_t *options) argument
10110 configure_option_update_move_destination(svn_client_conflict_t *conflict, apr_array_header_t *options) argument
10140 configure_option_update_raise_moved_away_children( svn_client_conflict_t *conflict, apr_array_header_t *options) argument
10174 configure_option_incoming_add_ignore(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10247 configure_option_incoming_added_file_text_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10315 configure_option_incoming_added_file_replace_and_merge( svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10372 configure_option_incoming_added_dir_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10445 configure_option_incoming_added_dir_replace(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10499 configure_option_incoming_added_dir_replace_and_merge( svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10555 configure_option_incoming_delete_ignore(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10630 configure_option_incoming_delete_accept(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10691 describe_incoming_move_merge_conflict_option( const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, const char *moved_to_abspath, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
10781 configure_option_incoming_move_file_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10850 configure_option_incoming_dir_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
10918 configure_option_local_move_file_or_dir_merge( svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
11005 configure_option_sibling_move_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
11110 resolve_both_moved_file_update_keep_local_move( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
11320 resolve_both_moved_file_update_keep_incoming_move( svn_client_conflict_option_t *option, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
11523 conflict_tree_get_details_update_local_moved_away( svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
11556 get_both_moved_file_paths(const char **incoming_moved_to_abspath, const char **local_moved_to_abspath, svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument
11618 conflict_tree_get_description_update_both_moved_file_merge( const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
11678 conflict_tree_get_description_update_both_moved_file_move_merge( const char **description, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
11730 configure_option_both_moved_file_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
11809 configure_option_both_moved_dir_merge(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_array_header_t *options, apr_pool_t *scratch_pool) argument
11947 svn_client_conflict_t *conflict = option->conflict; local
12093 svn_client_conflict_t *conflict = option->conflict; local
12206 svn_client_conflict_t *conflict = option->conflict; local
12375 svn_client_conflict_t *conflict = option->conflict; local
12582 svn_client_conflict_tree_get_resolution_options(apr_array_header_t **options, svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
12664 svn_client_conflict_tree_get_details(svn_client_conflict_t *conflict, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
12731 svn_client_conflict_get_recommended_option_id(svn_client_conflict_t *conflict) argument
12737 svn_client_conflict_text_resolve(svn_client_conflict_t *conflict, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
12770 svn_client_conflict_text_resolve_by_id( svn_client_conflict_t *conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
12798 svn_client_conflict_text_get_resolution(svn_client_conflict_t *conflict) argument
12804 svn_client_conflict_prop_resolve(svn_client_conflict_t *conflict, const char *propname, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
12818 svn_client_conflict_prop_resolve_by_id( svn_client_conflict_t *conflict, const char *propname, svn_client_conflict_option_id_t option_id, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
12847 svn_client_conflict_prop_get_resolution(svn_client_conflict_t *conflict, const char *propname) argument
12860 svn_client_conflict_tree_resolve(svn_client_conflict_t *conflict, svn_client_conflict_option_t *option, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
12872 svn_client_conflict_tree_resolve_by_id( svn_client_conflict_t *conflict, svn_client_conflict_option_id_t option_id, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument
12899 svn_client_conflict_tree_get_resolution(svn_client_conflict_t *conflict) argument
12906 get_conflict_desc2_t(svn_client_conflict_t *conflict) argument
12922 svn_client_conflict_get_conflicted(svn_boolean_t *text_conflicted, apr_array_header_t **props_conflicted, svn_boolean_t *tree_conflicted, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
12949 svn_client_conflict_get_local_abspath(svn_client_conflict_t *conflict) argument
12955 svn_client_conflict_get_operation(svn_client_conflict_t *conflict) argument
12961 svn_client_conflict_get_incoming_change(svn_client_conflict_t *conflict) argument
12967 svn_client_conflict_get_local_change(svn_client_conflict_t *conflict) argument
12973 svn_client_conflict_get_repos_info(const char **repos_root_url, const char **repos_uuid, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
13007 svn_client_conflict_get_incoming_old_repos_location( const char **incoming_old_repos_relpath, svn_revnum_t *incoming_old_pegrev, svn_node_kind_t *incoming_old_node_kind, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
13046 svn_client_conflict_get_incoming_new_repos_location( const char **incoming_new_repos_relpath, svn_revnum_t *incoming_new_pegrev, svn_node_kind_t *incoming_new_node_kind, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
13085 svn_client_conflict_tree_get_victim_node_kind(svn_client_conflict_t *conflict) argument
13094 svn_client_conflict_prop_get_propvals(const svn_string_t **base_propval, const svn_string_t **working_propval, const svn_string_t **incoming_old_propval, const svn_string_t **incoming_new_propval, svn_client_conflict_t *conflict, const char *propname, apr_pool_t *result_pool) argument
13131 svn_client_conflict_prop_get_reject_abspath(svn_client_conflict_t *conflict) argument
13141 svn_client_conflict_text_get_mime_type(svn_client_conflict_t *conflict) argument
13150 svn_client_conflict_text_get_contents(const char **base_abspath, const char **working_abspath, const char **incoming_old_abspath, const char **incoming_new_abspath, svn_client_conflict_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
13183 conflict_type_specific_setup(svn_client_conflict_t *conflict, apr_pool_t *scratch_pool) argument
13250 svn_client_conflict_get(svn_client_conflict_t **conflict, const char *local_abspath, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
13365 svn_client_conflict_t *conflict; local
[all...]
H A Dctx.c59 const svn_wc_conflict_description2_t *conflict,
70 cd = svn_wc__cd2_to_cd(conflict, scratch_pool);
56 call_conflict_func(svn_wc_conflict_result_t **result, const svn_wc_conflict_description2_t *conflict, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
/freebsd-11-stable/usr.sbin/etcupdate/tests/
H A Dfbsdid_test.sh132 # conflict: Modify a file where the local file has a different
133 # FreeBSD ID string. This should still generate a conflict
135 store_id $OLD/conflict ": head/conflict 12000 jhb "
136 store_id $NEW/conflict ": head/conflict 12345 jhb "
137 store_id $TEST/conflict ""
138 cat >> $OLD/conflict <<EOF
142 cat >> $NEW/conflict <<EOF
146 cat >> $TEST/conflict <<EO
257 conflict() function
[all...]
H A Dalways_test.sh87 # What follows are the various warning/conflict cases from the
144 # generate a new link conflict.
152 # This should generate a new file conflict.
190 # to the new file if possible. If the merge fails, a conflict
192 # conflict case.
193 cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
196 cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
199 cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
206 # /adddir/conflict: Add a new file in a directory that already
208 mkdir $NEW/adddir/conflict
355 conflict() function
[all...]
H A Dtests_test.sh311 # generate a new link conflict.
319 # This should generate a new file conflict.
432 # to the new file if possible. If the merge fails, a conflict
447 cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
450 cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
453 cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
465 # /adddir/conflict: Add a new file in a directory that already
467 mkdir $NEW/adddir/conflict
468 touch $NEW/adddir/conflict/newfile
469 touch $TEST/adddir/conflict
733 conflict() function
[all...]
/freebsd-11-stable/contrib/ntp/util/
H A Dntp-keygen-opts.h153 # warning undefining IMBITS due to option name conflict
157 # warning undefining CERTIFICATE due to option name conflict
161 # warning undefining CIPHER due to option name conflict
165 # warning undefining DEBUG_LEVEL due to option name conflict
169 # warning undefining SET_DEBUG_LEVEL due to option name conflict
173 # warning undefining ID_KEY due to option name conflict
177 # warning undefining GQ_PARAMS due to option name conflict
181 # warning undefining HOST_KEY due to option name conflict
185 # warning undefining IFFKEY due to option name conflict
189 # warning undefining IDENT due to option name conflict
[all...]
/freebsd-11-stable/contrib/ntp/sntp/
H A Dsntp-opts.h150 # warning undefining IPV4 due to option name conflict
154 # warning undefining IPV6 due to option name conflict
158 # warning undefining AUTHENTICATION due to option name conflict
162 # warning undefining BROADCAST due to option name conflict
166 # warning undefining CONCURRENT due to option name conflict
170 # warning undefining DEBUG_LEVEL due to option name conflict
174 # warning undefining SET_DEBUG_LEVEL due to option name conflict
178 # warning undefining GAP due to option name conflict
182 # warning undefining KOD due to option name conflict
186 # warning undefining KEYFILE due to option name conflict
[all...]
/freebsd-11-stable/contrib/ntp/ntpq/
H A Dntpq-opts.h143 # warning undefining IPV4 due to option name conflict
147 # warning undefining IPV6 due to option name conflict
151 # warning undefining COMMAND due to option name conflict
155 # warning undefining DEBUG_LEVEL due to option name conflict
159 # warning undefining SET_DEBUG_LEVEL due to option name conflict
163 # warning undefining INTERACTIVE due to option name conflict
167 # warning undefining NUMERIC due to option name conflict
171 # warning undefining OLD_RV due to option name conflict
175 # warning undefining PEERS due to option name conflict
179 # warning undefining REFID due to option name conflict
[all...]
/freebsd-11-stable/contrib/ntp/ntpdc/
H A Dntpdc-opts.h142 # warning undefining IPV4 due to option name conflict
146 # warning undefining IPV6 due to option name conflict
150 # warning undefining COMMAND due to option name conflict
154 # warning undefining DEBUG_LEVEL due to option name conflict
158 # warning undefining SET_DEBUG_LEVEL due to option name conflict
162 # warning undefining INTERACTIVE due to option name conflict
166 # warning undefining LISTPEERS due to option name conflict
170 # warning undefining NUMERIC due to option name conflict
174 # warning undefining PEERS due to option name conflict
178 # warning undefining SHOWPEERS due to option name conflict
[all...]
/freebsd-11-stable/gnu/usr.bin/rcs/lib/
H A Dpartime.c641 * If there is no conflict, merge into *T the additional information in *U
645 # define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b)) macro
647 conflict (t->tm.tm_sec, u->tm.tm_sec) ||
648 conflict (t->tm.tm_min, u->tm.tm_min) ||
649 conflict (t->tm.tm_hour, u->tm.tm_hour) ||
650 conflict (t->tm.tm_mday, u->tm.tm_mday) ||
651 conflict (t->tm.tm_mon, u->tm.tm_mon) ||
652 conflict (t->tm.tm_year, u->tm.tm_year) ||
653 conflict (t->tm.tm_wday, u->tm.tm_yday) ||
654 conflict (
663 # undef conflict macro
[all...]
/freebsd-11-stable/contrib/ntp/ntpsnmpd/
H A Dntpsnmpd-opts.h135 # warning undefining NOFORK due to option name conflict
139 # warning undefining SYSLOG due to option name conflict
143 # warning undefining AGENTXSOCKET due to option name conflict
/freebsd-11-stable/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/
H A Dtst.entryreturn.ksh54 * the conflict with a reserved word.
/freebsd-11-stable/crypto/openssl/crypto/engine/
H A Deng_list.c105 int conflict = 0; local
113 while (iterator && !conflict) {
114 conflict = (strcmp(iterator->id, e->id) == 0);
117 if (conflict) {
/freebsd-11-stable/usr.bin/localedef/
H A Dctype.c326 int conflict = 0; local
393 conflict++;
396 conflict++;
398 conflict++;
400 conflict++;
402 conflict++;
404 if (conflict) {

Completed in 258 milliseconds

12345