| /NextBSD/contrib/subversion/subversion/libsvn_client/ |
| HD | ctx.c | 64 if (ctx->conflict_func) in call_conflict_func()
69 SVN_ERR(ctx->conflict_func(result, cd, ctx->conflict_baton, in call_conflict_func()
|
| /NextBSD/contrib/subversion/subversion/libsvn_wc/ |
| HD | deprecated.c | 2581 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_merge_props2() argument
2597 conflict_wrapper.inner_func = conflict_func; in svn_wc_merge_props2()
2612 conflict_func ? conflict_func_1to2_wrapper in svn_wc_merge_props2()
3549 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_get_update_editor4() argument
3575 conflict_func, conflict_baton, in svn_wc_get_update_editor4()
3595 svn_wc_conflict_resolver_func_t conflict_func, in svn_wc_get_update_editor3() argument
3622 if (conflict_func) in svn_wc_get_update_editor3()
3625 cfw->inner_func = conflict_func; in svn_wc_get_update_editor3()
3646 conflict_func ? conflict_func_1to2_wrapper in svn_wc_get_update_editor3()
3735 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_get_switch_editor4() argument
[all …]
|
| HD | update_editor.c | 243 svn_wc_conflict_resolver_func2_t conflict_func; member
1813 if (eb->conflict_func) in delete_entry()
1818 eb->conflict_func, in delete_entry()
2818 if (conflict_skel && eb->conflict_func) in close_directory()
2823 eb->conflict_func, in close_directory()
3004 if (eb->conflict_func) in absent_node()
3009 eb->conflict_func, in absent_node()
4552 if (conflict_skel && eb->conflict_func) in close_file()
4557 eb->conflict_func, in close_file()
4858 svn_wc_conflict_resolver_func2_t conflict_func, in make_editor() argument
[all …]
|
| HD | conflicts.c | 1154 svn_wc_conflict_resolver_func2_t conflict_func, in generate_propconflict() argument
1309 SVN_ERR(conflict_func(&result, cdesc, conflict_baton, scratch_pool, in generate_propconflict()
2911 svn_wc_conflict_resolver_func2_t conflict_func; member
2974 (cswb->conflict_func != NULL) /* tmp files */, in conflict_status_walker()
3002 if (!cswb->conflict_func) in conflict_status_walker()
3007 SVN_ERR(cswb->conflict_func(&result, cd, cswb->conflict_baton, in conflict_status_walker()
3109 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc__resolve_conflicts() argument
3145 cswb.conflict_func = conflict_func; in svn_wc__resolve_conflicts()
|
| HD | merge.c | 1221 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_merge5() argument
1403 if (conflict_skel && conflict_func) in svn_wc_merge5()
1410 conflict_func, conflict_baton, in svn_wc_merge5()
|
| HD | props.c | 166 svn_wc_conflict_resolver_func2_t conflict_func, in svn_wc_merge_props3() argument
326 if (conflict_skel && conflict_func) in svn_wc_merge_props3()
333 conflict_func, conflict_baton, in svn_wc_merge_props3()
|
| /NextBSD/contrib/subversion/subversion/include/private/ |
| HD | svn_wc_private.h | 1473 svn_wc_conflict_resolver_func2_t conflict_func,
1515 svn_wc_conflict_resolver_func2_t conflict_func,
1741 svn_wc_conflict_resolver_func2_t conflict_func,
|
| /NextBSD/contrib/subversion/subversion/include/ |
| HD | svn_wc.h | 5853 svn_wc_conflict_resolver_func2_t conflict_func,
5902 svn_wc_conflict_resolver_func_t conflict_func,
5999 svn_wc_conflict_resolver_func2_t conflict_func,
6045 svn_wc_conflict_resolver_func_t conflict_func,
6990 svn_wc_conflict_resolver_func2_t conflict_func,
7022 svn_wc_conflict_resolver_func2_t conflict_func,
7056 svn_wc_conflict_resolver_func_t conflict_func,
7140 svn_wc_conflict_resolver_func2_t conflict_func,
7175 svn_wc_conflict_resolver_func_t conflict_func,
|
| HD | svn_client.h | 1003 svn_wc_conflict_resolver_func_t conflict_func; member
|
| /NextBSD/contrib/subversion/subversion/svnbench/ |
| HD | svnbench.c | 936 ctx->conflict_func = NULL; in sub_main()
|
| /NextBSD/contrib/subversion/subversion/svn/ |
| HD | svn.c | 3028 ctx->conflict_func = NULL; in sub_main()
|