Home
last modified time | relevance | path

Searched refs:conflict_func (Results 1 – 25 of 76) sorted by relevance

1234

/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_client/
H A Dctx.c64 if (ctx->conflict_func) in call_conflict_func()
69 SVN_ERR(ctx->conflict_func(result, cd, ctx->conflict_baton, in call_conflict_func()
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_client/
H A Dctx.c64 if (ctx->conflict_func) in call_conflict_func()
69 SVN_ERR(ctx->conflict_func(result, cd, ctx->conflict_baton, in call_conflict_func()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_client/
H A Dctx.c64 if (ctx->conflict_func) in call_conflict_func()
69 SVN_ERR(ctx->conflict_func(result, cd, ctx->conflict_baton, in call_conflict_func()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_client/
H A Dctx.c64 if (ctx->conflict_func) in call_conflict_func()
69 SVN_ERR(ctx->conflict_func(result, cd, ctx->conflict_baton, in call_conflict_func()
/dports/java/java-subversion/subversion-1.14.1/subversion/include/private/
H A Dsvn_wc_private.h85 svn_wc_conflict_resolver_func2_t conflict_func,
1527 svn_wc_conflict_resolver_func2_t conflict_func,
1569 svn_wc_conflict_resolver_func2_t conflict_func,
1795 svn_wc_conflict_resolver_func2_t conflict_func,
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/include/private/
H A Dsvn_wc_private.h85 svn_wc_conflict_resolver_func2_t conflict_func,
1527 svn_wc_conflict_resolver_func2_t conflict_func,
1569 svn_wc_conflict_resolver_func2_t conflict_func,
1795 svn_wc_conflict_resolver_func2_t conflict_func,
/dports/devel/p5-subversion/subversion-1.14.1/subversion/include/private/
H A Dsvn_wc_private.h85 svn_wc_conflict_resolver_func2_t conflict_func,
1527 svn_wc_conflict_resolver_func2_t conflict_func,
1569 svn_wc_conflict_resolver_func2_t conflict_func,
1795 svn_wc_conflict_resolver_func2_t conflict_func,
/dports/devel/py-subversion/subversion-1.14.1/subversion/include/private/
H A Dsvn_wc_private.h85 svn_wc_conflict_resolver_func2_t conflict_func,
1527 svn_wc_conflict_resolver_func2_t conflict_func,
1569 svn_wc_conflict_resolver_func2_t conflict_func,
1795 svn_wc_conflict_resolver_func2_t conflict_func,
/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Ddeprecated.c2653 conflict_wrapper.inner_func = conflict_func; in svn_wc_merge_props2()
3631 conflict_func, conflict_baton, in svn_wc_get_update_editor4()
3678 if (conflict_func) in svn_wc_get_update_editor3()
3681 cfw->inner_func = conflict_func; in svn_wc_get_update_editor3()
3815 conflict_func, conflict_baton, in svn_wc_get_switch_editor4()
3863 if (conflict_func) in svn_wc_get_switch_editor3()
3866 cfw->inner_func = conflict_func; in svn_wc_get_switch_editor3()
4572 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_merge4() argument
4595 conflict_func, conflict_baton, in svn_wc_merge4()
4613 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_merge3() argument
[all …]
H A Dexternals.c478 svn_wc_conflict_resolver_func2_t conflict_func; member
969 if (conflict_skel && eb->conflict_func) in close_file()
975 eb->conflict_func, in close_file()
1070 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc__get_file_external_editor() argument
1123 eb->conflict_func = conflict_func; in svn_wc__get_file_external_editor()
H A Dupdate_editor.c243 svn_wc_conflict_resolver_func2_t conflict_func; member
1818 if (eb->conflict_func) in delete_entry()
2826 if (conflict_skel && eb->conflict_func) in close_directory()
2831 eb->conflict_func, in close_directory()
3035 if (eb->conflict_func) in absent_node()
4586 if (conflict_skel && eb->conflict_func) in close_file()
4591 eb->conflict_func, in close_file()
4892 svn_wc_conflict_resolver_func2_t conflict_func, in make_editor() argument
4971 eb->conflict_func = conflict_func; in make_editor()
5197 conflict_func, conflict_baton, in svn_wc__get_update_editor()
[all …]
H A Dconflicts.c1189 svn_wc_conflict_resolver_func2_t conflict_func, in generate_propconflict() argument
1344 SVN_ERR(conflict_func(&result, cdesc, conflict_baton, scratch_pool, in generate_propconflict()
2977 svn_wc_conflict_resolver_func2_t conflict_func; member
3041 (cswb->conflict_func != NULL) /* tmp files */, in conflict_status_walker()
3068 if (!cswb->conflict_func) in conflict_status_walker()
3073 SVN_ERR(cswb->conflict_func(&result, cd, cswb->conflict_baton, in conflict_status_walker()
3204 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc__resolve_conflicts() argument
3225 cswb.conflict_func = conflict_func; in svn_wc__resolve_conflicts()
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Ddeprecated.c2653 conflict_wrapper.inner_func = conflict_func; in svn_wc_merge_props2()
3631 conflict_func, conflict_baton, in svn_wc_get_update_editor4()
3678 if (conflict_func) in svn_wc_get_update_editor3()
3681 cfw->inner_func = conflict_func; in svn_wc_get_update_editor3()
3815 conflict_func, conflict_baton, in svn_wc_get_switch_editor4()
3863 if (conflict_func) in svn_wc_get_switch_editor3()
3866 cfw->inner_func = conflict_func; in svn_wc_get_switch_editor3()
4572 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_merge4() argument
4595 conflict_func, conflict_baton, in svn_wc_merge4()
4613 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_merge3() argument
[all …]
H A Dexternals.c478 svn_wc_conflict_resolver_func2_t conflict_func; member
969 if (conflict_skel && eb->conflict_func) in close_file()
975 eb->conflict_func, in close_file()
1070 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc__get_file_external_editor() argument
1123 eb->conflict_func = conflict_func; in svn_wc__get_file_external_editor()
H A Dupdate_editor.c243 svn_wc_conflict_resolver_func2_t conflict_func; member
1818 if (eb->conflict_func) in delete_entry()
2826 if (conflict_skel && eb->conflict_func) in close_directory()
2831 eb->conflict_func, in close_directory()
3035 if (eb->conflict_func) in absent_node()
4586 if (conflict_skel && eb->conflict_func) in close_file()
4591 eb->conflict_func, in close_file()
4892 svn_wc_conflict_resolver_func2_t conflict_func, in make_editor() argument
4971 eb->conflict_func = conflict_func; in make_editor()
5197 conflict_func, conflict_baton, in svn_wc__get_update_editor()
[all …]
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/
H A Ddeprecated.c2653 conflict_wrapper.inner_func = conflict_func; in svn_wc_merge_props2()
3631 conflict_func, conflict_baton, in svn_wc_get_update_editor4()
3678 if (conflict_func) in svn_wc_get_update_editor3()
3681 cfw->inner_func = conflict_func; in svn_wc_get_update_editor3()
3815 conflict_func, conflict_baton, in svn_wc_get_switch_editor4()
3863 if (conflict_func) in svn_wc_get_switch_editor3()
3866 cfw->inner_func = conflict_func; in svn_wc_get_switch_editor3()
4572 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_merge4() argument
4595 conflict_func, conflict_baton, in svn_wc_merge4()
4613 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_merge3() argument
[all …]
H A Dexternals.c478 svn_wc_conflict_resolver_func2_t conflict_func; member
969 if (conflict_skel && eb->conflict_func) in close_file()
975 eb->conflict_func, in close_file()
1070 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc__get_file_external_editor() argument
1123 eb->conflict_func = conflict_func; in svn_wc__get_file_external_editor()
H A Dupdate_editor.c243 svn_wc_conflict_resolver_func2_t conflict_func; member
1818 if (eb->conflict_func) in delete_entry()
2826 if (conflict_skel && eb->conflict_func) in close_directory()
2831 eb->conflict_func, in close_directory()
3035 if (eb->conflict_func) in absent_node()
4586 if (conflict_skel && eb->conflict_func) in close_file()
4591 eb->conflict_func, in close_file()
4892 svn_wc_conflict_resolver_func2_t conflict_func, in make_editor() argument
4971 eb->conflict_func = conflict_func; in make_editor()
5197 conflict_func, conflict_baton, in svn_wc__get_update_editor()
[all …]
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Ddeprecated.c2653 conflict_wrapper.inner_func = conflict_func; in svn_wc_merge_props2()
3631 conflict_func, conflict_baton, in svn_wc_get_update_editor4()
3678 if (conflict_func) in svn_wc_get_update_editor3()
3681 cfw->inner_func = conflict_func; in svn_wc_get_update_editor3()
3815 conflict_func, conflict_baton, in svn_wc_get_switch_editor4()
3863 if (conflict_func) in svn_wc_get_switch_editor3()
3866 cfw->inner_func = conflict_func; in svn_wc_get_switch_editor3()
4572 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_merge4() argument
4595 conflict_func, conflict_baton, in svn_wc_merge4()
4613 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_merge3() argument
[all …]
H A Dexternals.c478 svn_wc_conflict_resolver_func2_t conflict_func; member
969 if (conflict_skel && eb->conflict_func) in close_file()
975 eb->conflict_func, in close_file()
1070 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc__get_file_external_editor() argument
1123 eb->conflict_func = conflict_func; in svn_wc__get_file_external_editor()
H A Dupdate_editor.c243 svn_wc_conflict_resolver_func2_t conflict_func; member
1818 if (eb->conflict_func) in delete_entry()
2826 if (conflict_skel && eb->conflict_func) in close_directory()
2831 eb->conflict_func, in close_directory()
3035 if (eb->conflict_func) in absent_node()
4586 if (conflict_skel && eb->conflict_func) in close_file()
4591 eb->conflict_func, in close_file()
4892 svn_wc_conflict_resolver_func2_t conflict_func, in make_editor() argument
4971 eb->conflict_func = conflict_func; in make_editor()
5197 conflict_func, conflict_baton, in svn_wc__get_update_editor()
[all …]
/dports/java/java-subversion/subversion-1.14.1/subversion/include/
H A Dsvn_wc.h5891 svn_wc_conflict_resolver_func2_t conflict_func,
5940 svn_wc_conflict_resolver_func_t conflict_func,
6037 svn_wc_conflict_resolver_func2_t conflict_func,
6083 svn_wc_conflict_resolver_func_t conflict_func,
7028 svn_wc_conflict_resolver_func2_t conflict_func,
7060 svn_wc_conflict_resolver_func2_t conflict_func,
7094 svn_wc_conflict_resolver_func_t conflict_func,
7178 svn_wc_conflict_resolver_func2_t conflict_func,
7213 svn_wc_conflict_resolver_func_t conflict_func,
/dports/devel/py-subversion/subversion-1.14.1/subversion/include/
H A Dsvn_wc.h5891 svn_wc_conflict_resolver_func2_t conflict_func,
5940 svn_wc_conflict_resolver_func_t conflict_func,
6037 svn_wc_conflict_resolver_func2_t conflict_func,
6083 svn_wc_conflict_resolver_func_t conflict_func,
7028 svn_wc_conflict_resolver_func2_t conflict_func,
7060 svn_wc_conflict_resolver_func2_t conflict_func,
7094 svn_wc_conflict_resolver_func_t conflict_func,
7178 svn_wc_conflict_resolver_func2_t conflict_func,
7213 svn_wc_conflict_resolver_func_t conflict_func,
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/include/
H A Dsvn_wc.h5891 svn_wc_conflict_resolver_func2_t conflict_func,
5940 svn_wc_conflict_resolver_func_t conflict_func,
6037 svn_wc_conflict_resolver_func2_t conflict_func,
6083 svn_wc_conflict_resolver_func_t conflict_func,
7028 svn_wc_conflict_resolver_func2_t conflict_func,
7060 svn_wc_conflict_resolver_func2_t conflict_func,
7094 svn_wc_conflict_resolver_func_t conflict_func,
7178 svn_wc_conflict_resolver_func2_t conflict_func,
7213 svn_wc_conflict_resolver_func_t conflict_func,
/dports/devel/p5-subversion/subversion-1.14.1/subversion/include/
H A Dsvn_wc.h5891 svn_wc_conflict_resolver_func2_t conflict_func,
5940 svn_wc_conflict_resolver_func_t conflict_func,
6037 svn_wc_conflict_resolver_func2_t conflict_func,
6083 svn_wc_conflict_resolver_func_t conflict_func,
7028 svn_wc_conflict_resolver_func2_t conflict_func,
7060 svn_wc_conflict_resolver_func2_t conflict_func,
7094 svn_wc_conflict_resolver_func_t conflict_func,
7178 svn_wc_conflict_resolver_func2_t conflict_func,
7213 svn_wc_conflict_resolver_func_t conflict_func,

1234