| H A D | merge.c | 7521 do_file_merge(svn_mergeinfo_catalog_t result_catalog, single_range_conflict_report_t **conflict_report, const merge_source_t *source, const char *target_abspath, const svn_diff_tree_processor_t *processor, svn_boolean_t sources_related, svn_boolean_t squelch_mergeinfo_notifications, merge_cmd_baton_t *merge_b, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
8079 do_mergeinfo_unaware_dir_merge(single_range_conflict_report_t **conflict_report, const merge_source_t *source, const char *target_dir_wcpath, apr_array_header_t *children_with_mergeinfo, const svn_diff_tree_processor_t *processor, svn_depth_t depth, merge_cmd_baton_t *merge_b, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
9364 do_mergeinfo_aware_dir_merge(svn_mergeinfo_catalog_t result_catalog, single_range_conflict_report_t **conflict_report, const merge_source_t *source, const char *target_abspath, apr_array_header_t *children_with_mergeinfo, const svn_diff_tree_processor_t *processor, svn_depth_t depth, svn_boolean_t squelch_mergeinfo_notifications, merge_cmd_baton_t *merge_b, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
9684 do_directory_merge(svn_mergeinfo_catalog_t result_catalog, single_range_conflict_report_t **conflict_report, const merge_source_t *source, const char *target_abspath, const svn_diff_tree_processor_t *processor, svn_depth_t depth, svn_boolean_t squelch_mergeinfo_notifications, merge_cmd_baton_t *merge_b, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
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
10698 svn_client__conflict_report_t *conflict_report; local
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
11839 svn_client__conflict_report_t *conflict_report; local
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
12004 svn_client__conflict_report_t *conflict_report; local
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...] |