/freebsd-11-stable/contrib/subversion/subversion/svn/ |
H A D | deprecated.c | 33 const apr_array_header_t *merge_options, 38 target_wcpath, dry_run, merge_options, 29 svn_cl__deprecated_merge_reintegrate(const char *source_path_or_url, const svn_opt_revision_t *src_peg_revision, const char *target_wcpath, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument
|
H A D | cl.h | 1012 const apr_array_header_t *merge_options,
|
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/ |
H A D | merge_elements.c | 162 const apr_array_header_t *merge_options, 221 const apr_array_header_t *merge_options, 243 force_delete, dry_run, merge_options, 153 merge_elements_one_source(svn_boolean_t *use_sleep, const svn_client__pathrev_t *src_left, const svn_client__pathrev_t *src_right, merge_target_t *target, svn_ra_session_t *ra_session, element_matching_info_t *element_matching_info, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *scratch_pool) argument 214 svn_client__merge_elements(svn_boolean_t *use_sleep, apr_array_header_t *merge_sources, merge_target_t *target, svn_ra_session_t *ra_session, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
|
H A D | client.h | 1194 const apr_array_header_t *merge_options, 1234 const apr_array_header_t *merge_options,
|
H A D | merge.c | 318 const apr_array_header_t *merge_options; 2152 merge_b->merge_options, 9860 const apr_array_header_t *merge_options, 9947 merge_cmd_baton.merge_options = merge_options; 10166 const apr_array_header_t *merge_options, 10214 FALSE, depth, merge_options, ctx, 10255 TRUE, depth, merge_options, ctx, 10270 TRUE, depth, merge_options, ctx, 10508 const apr_array_header_t *merge_options, 315 const apr_array_header_t *merge_options; member in struct:merge_cmd_baton_t 9833 do_merge(apr_hash_t **modified_subtrees, svn_mergeinfo_catalog_t result_catalog, svn_client__conflict_report_t **conflict_report, svn_boolean_t *use_sleep, const apr_array_header_t *merge_sources, const merge_target_t *target, svn_ra_session_t *src_session, svn_boolean_t sources_related, svn_boolean_t same_repos, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t dry_run, svn_boolean_t record_only, apr_hash_t *record_only_paths, svn_boolean_t reintegrate_merge, svn_boolean_t squelch_mergeinfo_notifications, svn_depth_t depth, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 10143 merge_cousins_and_supplement_mergeinfo( svn_client__conflict_report_t **conflict_report, svn_boolean_t *use_sleep, const merge_target_t *target, svn_ra_session_t *URL1_ra_session, svn_ra_session_t *URL2_ra_session, const merge_source_t *source, const svn_client__pathrev_t *yca, svn_boolean_t same_repos, svn_depth_t depth, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 10485 svn_client__merge_locked(svn_client__conflict_report_t **conflict_report, const char *source1, const svn_opt_revision_t *revision1, const char *source2, const svn_opt_revision_t *revision2, const char *target_abspath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 10681 svn_client_merge5(const char *source1, const svn_opt_revision_t *revision1, const char *source2, const svn_opt_revision_t *revision2, const char *target_wcpath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument 11764 merge_reintegrate_locked(svn_client__conflict_report_t **conflict_report, const char *source_path_or_url, const svn_opt_revision_t *source_peg_revision, const char *target_abspath, svn_boolean_t diff_ignore_ancestry, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 11830 svn_client_merge_reintegrate(const char *source_path_or_url, const svn_opt_revision_t *source_peg_revision, const char *target_wcpath, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument 11869 merge_peg_locked(svn_client__conflict_report_t **conflict_report, const char *source_path_or_url, const svn_opt_revision_t *source_peg_revision, const svn_rangelist_t *ranges_to_merge, const char *target_abspath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 11988 svn_client_merge_peg5(const char *source_path_or_url, const apr_array_header_t *ranges_to_merge, const svn_opt_revision_t *source_peg_revision, const char *target_wcpath, svn_depth_t depth, svn_boolean_t ignore_mergeinfo, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument 12754 do_automatic_merge_locked(svn_client__conflict_report_t **conflict_report, const automatic_merge_t *merge, const char *target_abspath, svn_depth_t depth, svn_boolean_t diff_ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument [all...] |
H A D | deprecated.c | 1828 const apr_array_header_t *merge_options, 1840 merge_options, ctx, pool)); 1855 const apr_array_header_t *merge_options, 1861 record_only, dry_run, TRUE, merge_options, 1875 const apr_array_header_t *merge_options, 1883 merge_options, ctx, pool); 1915 const apr_array_header_t *merge_options, 1928 merge_options, ctx, pool)); 1942 const apr_array_header_t *merge_options, 1948 record_only, dry_run, TRUE, merge_options, 1815 svn_client_merge4(const char *source1, const svn_opt_revision_t *revision1, const char *source2, const svn_opt_revision_t *revision2, const char *target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument 1843 svn_client_merge3(const char *source1, const svn_opt_revision_t *revision1, const char *source2, const svn_opt_revision_t *revision2, const char *target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument 1864 svn_client_merge2(const char *source1, const svn_opt_revision_t *revision1, const char *source2, const svn_opt_revision_t *revision2, const char *target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument 1903 svn_client_merge_peg4(const char *source_path_or_url, const apr_array_header_t *ranges_to_merge, const svn_opt_revision_t *source_peg_revision, const char *target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force_delete, svn_boolean_t record_only, svn_boolean_t dry_run, svn_boolean_t allow_mixed_rev, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument 1931 svn_client_merge_peg3(const char *source, const apr_array_header_t *ranges_to_merge, const svn_opt_revision_t *peg_revision, const char *target_wcpath, svn_depth_t depth, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t record_only, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument 1951 svn_client_merge_peg2(const char *source, const svn_opt_revision_t *revision1, const svn_opt_revision_t *revision2, const svn_opt_revision_t *peg_revision, const char *target_wcpath, svn_boolean_t recurse, svn_boolean_t ignore_ancestry, svn_boolean_t force, svn_boolean_t dry_run, const apr_array_header_t *merge_options, svn_client_ctx_t *ctx, apr_pool_t *pool) argument [all...] |
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
H A D | merge.c | 54 const apr_array_header_t *merge_options; member in struct:merge_target_t 389 const apr_array_header_t *merge_options, 409 if (merge_options) 411 merge_options, pool)); 445 const apr_array_header_t *merge_options, 460 merge_options, scratch_pool)); 860 mt->merge_options, 871 mt->merge_options, 1093 const apr_array_header_t *merge_options, 1119 mt.merge_options 386 do_text_merge(svn_boolean_t *contains_conflicts, apr_file_t *result_f, const apr_array_header_t *merge_options, const char *detranslated_target, const char *left, const char *right, const char *target_label, const char *left_label, const char *right_label, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *pool) argument 441 do_text_merge_external(svn_boolean_t *contains_conflicts, apr_file_t *result_f, const char *diff3_cmd, const apr_array_header_t *merge_options, const char *detranslated_target, const char *left_abspath, const char *right_abspath, const char *target_label, const char *left_label, const char *right_label, apr_pool_t *scratch_pool) argument 1078 svn_wc__internal_merge(svn_skel_t **work_items, svn_skel_t **conflict_skel, enum svn_wc_merge_outcome_t *merge_outcome, svn_wc__db_t *db, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *wri_abspath, const char *left_label, const char *right_label, const char *target_label, apr_hash_t *old_actual_props, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 1205 svn_wc_merge5(enum svn_wc_merge_outcome_t *merge_content_outcome, enum svn_wc_notify_state_t *merge_props_outcome, svn_wc_context_t *wc_ctx, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *left_label, const char *right_label, const char *target_label, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, apr_hash_t *original_props, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument [all...] |
H A D | conflicts.h | 431 const apr_array_header_t *merge_options,
|
H A D | wc.h | 425 const apr_array_header_t *merge_options,
|
H A D | conflicts.c | 1455 const apr_array_header_t *merge_options, 1471 if (merge_options) 1473 merge_options, 1609 const apr_array_header_t *merge_options, 1690 style, merge_options, 1889 const apr_array_header_t *merge_options, 2034 merge_options, 3116 NULL /* merge_options */, 1450 merge_showing_conflicts(const char **chosen_abspath, svn_wc__db_t *db, const char *wri_abspath, svn_diff_conflict_display_style_t style, const apr_array_header_t *merge_options, const char *left_abspath, const char *detranslated_target, const char *right_abspath, svn_io_file_del_t delete_when, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 1600 build_text_conflict_resolve_items(svn_skel_t **work_items, svn_boolean_t *found_artifact, svn_wc__db_t *db, const char *local_abspath, const svn_skel_t *conflict, svn_wc_conflict_choice_t choice, const char *merged_file, svn_boolean_t save_merged, const apr_array_header_t *merge_options, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 1884 svn_wc__conflict_invoke_resolver(svn_wc__db_t *db, const char *local_abspath, svn_node_kind_t kind, const svn_skel_t *conflict_skel, const apr_array_header_t *merge_options, svn_wc_conflict_resolver_func2_t resolver_func, void *resolver_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument
|
H A D | deprecated.c | 4571 const apr_array_header_t *merge_options, 4593 merge_options, 4612 const apr_array_header_t *merge_options, 4647 merge_options, 4668 const apr_array_header_t *merge_options, 4674 dry_run, diff3_cmd, merge_options, NULL, 4558 svn_wc_merge4(enum svn_wc_merge_outcome_t *merge_outcome, svn_wc_context_t *wc_ctx, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *left_label, const char *right_label, const char *target_label, const svn_wc_conflict_version_t *left_version, const svn_wc_conflict_version_t *right_version, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func2_t conflict_func, void *conflict_baton, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *scratch_pool) argument 4601 svn_wc_merge3(enum svn_wc_merge_outcome_t *merge_outcome, const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, const apr_array_header_t *prop_diff, svn_wc_conflict_resolver_func_t conflict_func, void *conflict_baton, apr_pool_t *pool) argument 4657 svn_wc_merge2(enum svn_wc_merge_outcome_t *merge_outcome, const char *left, const char *right, const char *merge_target, svn_wc_adm_access_t *adm_access, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *diff3_cmd, const apr_array_header_t *merge_options, apr_pool_t *pool) argument
|
/freebsd-11-stable/contrib/subversion/subversion/include/ |
H A D | svn_client.h | 3778 * @a merge_options (an array of <tt>const char *</tt>), if non-NULL, 3817 const apr_array_header_t *merge_options, 3841 const apr_array_header_t *merge_options, 3866 const apr_array_header_t *merge_options, 3891 const apr_array_header_t *merge_options, 3897 * Similar to svn_client_merge2(), but with @a merge_options set to NULL. 3938 const apr_array_header_t *merge_options, 3984 const apr_array_header_t *merge_options, 4008 const apr_array_header_t *merge_options, 4032 const apr_array_header_t *merge_options, [all...] |
H A D | svn_wc.h | 6963 * merge_options is non-NULL, either pass its elements to @a diff3_cmd or 6965 * svn_diff_file_options_parse()). @a merge_options must contain 7039 const apr_array_header_t *merge_options, 7072 const apr_array_header_t *merge_options, 7106 const apr_array_header_t *merge_options, 7130 const apr_array_header_t *merge_options, 7134 /** Similar to svn_wc_merge2(), but with @a merge_options set to NULL.
|