| /freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/ |
| H A D | merge.c | 662 merge_file_trivial(svn_skel_t **work_items, enum svn_wc_merge_outcome_t *merge_outcome, const char *left_abspath, const char *right_abspath, const char *target_abspath, const char *detranslated_target_abspath, svn_boolean_t dry_run, svn_wc__db_t *db, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
816 merge_text_file(svn_skel_t **work_items, svn_skel_t **conflict_skel, enum svn_wc_merge_outcome_t *merge_outcome, const merge_target_t *mt, const char *left_abspath, const char *right_abspath, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *detranslated_target_abspath, svn_cancel_func_t cancel_func, void *cancel_baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
986 merge_binary_file(svn_skel_t **work_items, svn_skel_t **conflict_skel, enum svn_wc_merge_outcome_t *merge_outcome, const merge_target_t *mt, const char *left_abspath, const char *right_abspath, const char *left_label, const char *right_label, const char *target_label, svn_boolean_t dry_run, const char *detranslated_target_abspath, apr_pool_t *result_pool, 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
[all...] |
| H A D | update_editor.c | 3879 enum svn_wc_merge_outcome_t merge_outcome = svn_wc_merge_unchanged; local
|
| H A D | wc_db_update_move.c | 1325 enum svn_wc_merge_outcome_t merge_outcome; local
1475 enum svn_wc_merge_outcome_t merge_outcome; local
3113 enum svn_wc_merge_outcome_t merge_outcome; local
|
| H A D | deprecated.c | 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
4678 svn_wc_merge(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, enum svn_wc_merge_outcome_t *merge_outcome, const char *diff3_cmd, apr_pool_t *pool) argument
|