Home
last modified time | relevance | path

Searched refs:merge_options (Results 1 – 13 of 13) sorted by relevance

/freebsd-13-stable/contrib/subversion/subversion/libsvn_wc/
HDmerge.c54 const apr_array_header_t *merge_options; member
388 const apr_array_header_t *merge_options, in do_text_merge() argument
408 if (merge_options) in do_text_merge()
410 merge_options, pool)); in do_text_merge()
444 const apr_array_header_t *merge_options, in do_text_merge_external() argument
459 merge_options, scratch_pool)); in do_text_merge_external()
859 mt->merge_options, in merge_text_file()
870 mt->merge_options, in merge_text_file()
1092 const apr_array_header_t *merge_options, in svn_wc__internal_merge() argument
1118 mt.merge_options = merge_options; in svn_wc__internal_merge()
[all …]
HDconflicts.h431 const apr_array_header_t *merge_options,
HDwc.h418 const apr_array_header_t *merge_options,
HDconflicts.c1454 const apr_array_header_t *merge_options, in merge_showing_conflicts() argument
1470 if (merge_options) in merge_showing_conflicts()
1472 merge_options, in merge_showing_conflicts()
1608 const apr_array_header_t *merge_options, in build_text_conflict_resolve_items() argument
1689 style, merge_options, in build_text_conflict_resolve_items()
1888 const apr_array_header_t *merge_options, in svn_wc__conflict_invoke_resolver() argument
2033 merge_options, in svn_wc__conflict_invoke_resolver()
HDdeprecated.c4570 const apr_array_header_t *merge_options, in svn_wc_merge4() argument
4592 merge_options, in svn_wc_merge4()
4611 const apr_array_header_t *merge_options, in svn_wc_merge3() argument
4646 merge_options, in svn_wc_merge3()
4667 const apr_array_header_t *merge_options, in svn_wc_merge2() argument
4673 dry_run, diff3_cmd, merge_options, NULL, in svn_wc_merge2()
/freebsd-13-stable/contrib/subversion/subversion/svn/
HDdeprecated.c33 const apr_array_header_t *merge_options, in svn_cl__deprecated_merge_reintegrate() argument
38 target_wcpath, dry_run, merge_options, in svn_cl__deprecated_merge_reintegrate()
HDcl.h1002 const apr_array_header_t *merge_options,
/freebsd-13-stable/contrib/subversion/subversion/libsvn_client/
HDmerge_elements.c162 const apr_array_header_t *merge_options, in merge_elements_one_source() argument
221 const apr_array_header_t *merge_options, in svn_client__merge_elements() argument
243 force_delete, dry_run, merge_options, in svn_client__merge_elements()
HDdeprecated.c1826 const apr_array_header_t *merge_options, in svn_client_merge4() argument
1838 merge_options, ctx, pool)); in svn_client_merge4()
1853 const apr_array_header_t *merge_options, in svn_client_merge3() argument
1859 record_only, dry_run, TRUE, merge_options, in svn_client_merge3()
1873 const apr_array_header_t *merge_options, in svn_client_merge2() argument
1881 merge_options, ctx, pool); in svn_client_merge2()
1913 const apr_array_header_t *merge_options, in svn_client_merge_peg4() argument
1926 merge_options, ctx, pool)); in svn_client_merge_peg4()
1940 const apr_array_header_t *merge_options, in svn_client_merge_peg3() argument
1946 record_only, dry_run, TRUE, merge_options, in svn_client_merge_peg3()
[all …]
HDclient.h1194 const apr_array_header_t *merge_options,
1234 const apr_array_header_t *merge_options,
HDmerge.c315 const apr_array_header_t *merge_options; member
2148 merge_b->merge_options, in merge_file_changed()
9851 const apr_array_header_t *merge_options, in do_merge() argument
9938 merge_cmd_baton.merge_options = merge_options; in do_merge()
10157 const apr_array_header_t *merge_options, in merge_cousins_and_supplement_mergeinfo() argument
10205 FALSE, depth, merge_options, ctx, in merge_cousins_and_supplement_mergeinfo()
10246 TRUE, depth, merge_options, ctx, in merge_cousins_and_supplement_mergeinfo()
10261 TRUE, depth, merge_options, ctx, in merge_cousins_and_supplement_mergeinfo()
10498 const apr_array_header_t *merge_options, in svn_client__merge_locked() argument
10617 merge_options, in svn_client__merge_locked()
[all …]
/freebsd-13-stable/contrib/subversion/subversion/include/
HDsvn_client.h3815 const apr_array_header_t *merge_options,
3839 const apr_array_header_t *merge_options,
3864 const apr_array_header_t *merge_options,
3889 const apr_array_header_t *merge_options,
3936 const apr_array_header_t *merge_options,
3982 const apr_array_header_t *merge_options,
4006 const apr_array_header_t *merge_options,
4030 const apr_array_header_t *merge_options,
4055 const apr_array_header_t *merge_options,
HDsvn_wc.h7025 const apr_array_header_t *merge_options,
7058 const apr_array_header_t *merge_options,
7092 const apr_array_header_t *merge_options,
7116 const apr_array_header_t *merge_options,