Home
last modified time | relevance | path

Searched refs:svn_client_conflict_t (Results 1 – 9 of 9) sorted by relevance

/freebsd-13-stable/contrib/subversion/subversion/svn/
HDcl-conflicts.h52 svn_client_conflict_t *conflict,
64 svn_client_conflict_t *conflict,
84 svn_client_conflict_t *conflict,
HDcl-conflicts.c224 svn_client_conflict_t *conflict, in svn_cl__get_human_readable_prop_conflict_description()
283 svn_client_conflict_t *conflict, in svn_cl__get_human_readable_tree_conflict_description()
406 svn_client_conflict_t *conflict, in append_tree_conflict_info_xml()
474 svn_client_conflict_t *conflict, in svn_cl__append_conflict_info_xml()
HDconflict-callbacks.c92 show_diff(svn_client_conflict_t *conflict, in show_diff()
174 show_conflicts(svn_client_conflict_t *conflict, in show_conflicts()
573 svn_client_conflict_t *conflict, in find_option_by_builtin()
764 svn_client_conflict_t *conflict, in build_text_conflict_options()
826 mark_conflict_resolved(svn_client_conflict_t *conflict, in mark_conflict_resolved()
877 svn_client_conflict_t *conflict, in handle_text_conflict()
1226 svn_client_conflict_t *conflict, in build_prop_conflict_options()
1285 svn_client_conflict_t *conflict, in handle_one_prop_conflict()
1412 svn_client_conflict_t *conflict, in handle_prop_conflicts()
1478 svn_client_conflict_t *conflict, in build_tree_conflict_options()
[all …]
HDresolve-cmd.c57 conflict_walker(void *baton, svn_client_conflict_t *conflict, in conflict_walker()
109 svn_client_conflict_t *conflict; in svn_cl__walk_conflicts()
HDstatus.c285 svn_client_conflict_t *tree_conflict; in print_status()
HDinfo-cmd.c687 svn_client_conflict_t *conflict; in print_info_xml()
890 svn_client_conflict_t *conflict; in print_info()
HDcl.h512 svn_client_conflict_t *conflict,
/freebsd-13-stable/contrib/subversion/subversion/include/
HDsvn_client.h4572 typedef struct svn_client_conflict_t svn_client_conflict_t; typedef
4854 svn_client_conflict_get(svn_client_conflict_t **conflict,
4870 svn_client_conflict_t *conflict,
4909 svn_client_conflict_t *conflict,
4926 svn_client_conflict_t *conflict,
4972 svn_client_conflict_t *conflict,
4985 svn_client_conflict_t *conflict,
4998 svn_client_conflict_t *conflict,
5015 svn_client_conflict_t *conflict,
5035 svn_client_conflict_tree_get_details(svn_client_conflict_t *conflict,
[all …]
/freebsd-13-stable/contrib/subversion/subversion/libsvn_client/
HDconflicts.c59 svn_client_conflict_t *conflict,
67 svn_client_conflict_t *conflict,
71 struct svn_client_conflict_t struct
122 svn_client_conflict_t *conflict, argument
132 svn_client_conflict_t *conflict;
200 svn_client_conflict_t *conflict, in add_legacy_desc_to_conflict()
1115 svn_client_conflict_t *conflict, in describe_local_file_node_change()
1339 svn_client_conflict_t *conflict, in describe_local_dir_node_change()
2219 svn_client_conflict_t *conflict, in find_revision_for_suspected_deletion()
2414 svn_client_conflict_t *conflict, in find_related_node()
[all …]