H A D | merge.c | 199 * merge target and any of its subtrees which have explicit mergeinfo 204 * describing a contiguous range to be merged to the WC merge target. 243 target. Defaults to FALSE if DRY_RUN 255 const merge_target_t *target; /* Description of merge target node */ 356 source is in the same repository as the merge target, and we are not 432 check_repos_match(const merge_target_t *target, 437 if (!svn_uri__is_ancestor(target->loc.repos_root_url, url)) 442 target->loc.repos_root_url); 556 check_root = ! strcmp(local_abspath, merge_b->target 252 const merge_target_t *target; /* Description of merge target node */ member in struct:merge_cmd_baton_t 428 check_repos_match(const merge_target_t *target, const char *local_abspath, const char *url, apr_pool_t *scratch_pool) argument 571 make_conflict_versions(const svn_wc_conflict_version_t **left, const svn_wc_conflict_version_t **right, const char *victim_abspath, svn_node_kind_t merge_left_node_kind, svn_node_kind_t merge_right_node_kind, const merge_source_t *merge_source, const merge_target_t *target, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 4139 fix_deleted_subtree_ranges(const merge_source_t *source, const merge_target_t *target, svn_ra_session_t *ra_session, apr_array_header_t *children_with_mergeinfo, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 4304 svn_client__pathrev_t *target; local 6199 insert_parent_and_sibs_of_sw_absent_del_subtree( apr_array_header_t *children_with_mergeinfo, const merge_target_t *target, int *curr_index, svn_client__merge_path_t *child, svn_depth_t depth, svn_client_ctx_t *ctx, apr_pool_t *pool) argument 6482 get_mergeinfo_paths(apr_array_header_t *children_with_mergeinfo, const merge_target_t *target, svn_depth_t depth, svn_boolean_t dry_run, svn_boolean_t same_repos, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 8953 const merge_target_t *target; member in struct:log_noop_baton_t 9146 remove_noop_subtree_ranges(const merge_source_t *source, const merge_target_t *target, svn_ra_session_t *ra_session, apr_array_header_t *children_with_mergeinfo, 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 10419 merge_target_t *target = apr_palloc(result_pool, sizeof(*target)); local 10503 merge_target_t *target; local 11173 find_unmerged_mergeinfo(svn_mergeinfo_catalog_t *unmerged_to_source_catalog, svn_revnum_t *youngest_merged_rev, svn_revnum_t yc_ancestor_rev, svn_mergeinfo_catalog_t source_catalog, apr_hash_t *target_history_hash, const svn_client__pathrev_t *source_loc, const merge_target_t *target, svn_ra_session_t *source_ra_session, svn_ra_session_t *target_ra_session, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 11403 calculate_left_hand_side(svn_client__pathrev_t **left_p, svn_mergeinfo_catalog_t *merged_to_source_catalog, svn_mergeinfo_catalog_t *unmerged_to_source_catalog, const merge_target_t *target, apr_hash_t *subtrees_with_mergeinfo, const svn_client__pathrev_t *source_loc, svn_ra_session_t *source_ra_session, svn_ra_session_t *target_ra_session, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 11559 find_reintegrate_merge(merge_source_t **source_p, svn_client__pathrev_t **yc_ancestor_p, svn_ra_session_t *source_ra_session, const svn_client__pathrev_t *source_loc, svn_ra_session_t *target_ra_session, const merge_target_t *target, svn_client_ctx_t *ctx, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 11723 merge_target_t *target; local 11776 merge_target_t *target; local 11886 merge_target_t *target; local 11956 svn_client__pathrev_t *yca, *base, *right, *target; member in struct:automatic_merge_t 12133 merge_target_t *target; member in struct:source_and_target_t 12345 find_last_merged_location(svn_client__pathrev_t **base_p, svn_client__pathrev_t *yca, const branch_history_t *source_branch, svn_client__pathrev_t *target, svn_client_ctx_t *ctx, svn_ra_session_t *ra_session, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument 12767 merge_target_t *target; local [all...] |