Searched defs:conflict (Results 1 - 25 of 35) sorted by relevance

12

/freebsd-10-stable/usr.sbin/etcupdate/tests/
H A Dpreworld_test.sh191 conflict() function
H A Dalways_test.sh355 conflict() function
[all...]
H A Dconflicts_test.sh178 conflict() function
[all...]
H A Dfbsdid_test.sh257 conflict() function
[all...]
H A Dignore_test.sh152 conflict() function
H A Dtests_test.sh733 conflict() function
[all...]
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/
H A Dctx.c56 call_conflict_func(svn_wc_conflict_result_t **result, const svn_wc_conflict_description2_t *conflict, void *baton, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
/freebsd-10-stable/crypto/openssl/crypto/engine/
H A Deng_list.c104 int conflict = 0; local
/freebsd-10-stable/contrib/subversion/subversion/svn/
H A Dcl-conflicts.c230 svn_cl__get_human_readable_prop_conflict_description( const char **desc, const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
284 svn_cl__get_human_readable_tree_conflict_description( const char **desc, const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
397 append_tree_conflict_info_xml(svn_stringbuf_t *str, const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
443 svn_cl__append_conflict_info_xml(svn_stringbuf_t *str, const svn_wc_conflict_description2_t *conflict, apr_pool_t *scratch_pool) argument
[all...]
H A Dinfo-cmd.c397 const svn_wc_conflict_description2_t *conflict = local
590 const svn_wc_conflict_description2_t *conflict = local
653 const svn_wc_conflict_description2_t *conflict = local
[all...]
/freebsd-10-stable/gnu/usr.bin/rcs/lib/
H A Dpartime.c645 # define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b)) macro
663 # undef conflict macro
[all...]
/freebsd-10-stable/usr.sbin/pkg_install/add/
H A Dperform.c79 char *conflict[2]; local
/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
H A Dutil.c195 svn_wc_conflict_description2_t *conflict; local
214 svn_wc_conflict_description2_t *conflict; local
235 svn_wc_conflict_description2_t *conflict; local
278 svn_wc_conflict_description2_dup(const svn_wc_conflict_description2_t *conflict, apr_pool_t *pool) argument
359 svn_wc__cd2_to_cd(const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool) argument
[all...]
H A Dtree_conflicts.c200 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict, argument
332 svn_wc__serialize_conflict(svn_skel_t **skel, const svn_wc_conflict_description2_t *conflict, apr_pool_t *result_pool, apr_pool_t *scratch_pool) argument
406 svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx, const svn_wc_conflict_description2_t *conflict, apr_pool_t *scratch_pool) argument
[all...]
H A Ddelete.c134 svn_skel_t *conflict; local
H A Dcopy.c256 svn_skel_t *conflict; local
947 svn_skel_t *conflict; local
[all...]
H A Dwc_db_update_move.c229 update_move_list_add(svn_wc__db_wcroot_t *wcroot, const char *local_relpath, svn_wc__db_t *db, svn_wc_notify_action_t action, svn_node_kind_t kind, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_skel_t *conflict, svn_skel_t *work_item, apr_pool_t *scratch_pool) argument
352 svn_skel_t *conflict; local
561 svn_skel_t *conflict; local
667 svn_skel_t *conflict = NULL; local
752 svn_skel_t *conflict = NULL; local
1211 svn_skel_t *conflict = NULL; local
1900 svn_skel_t *conflict; local
2045 svn_skel_t *conflict; local
2395 svn_skel_t *conflict; local
2445 svn_skel_t *conflict; local
[all...]
H A Dupgrade.c696 const svn_wc_conflict_description2_t *conflict; local
731 const svn_wc_conflict_description2_t *conflict = apr_hash_this_val(hi); local
[all...]
H A Dentries.c494 const svn_wc_conflict_description2_t *conflict = local
939 svn_skel_t *conflict; local
2018 svn_wc_conflict_description2_t *conflict; local
[all...]
/freebsd-10-stable/sbin/gvinum/
H A Dgvinum.c572 int i, n, begin, len, conflict; local
/freebsd-10-stable/usr.sbin/timed/timed/
H A Dtimed.c478 struct tsp resp, conflict, *answer; local
/freebsd-10-stable/sys/dev/drm2/radeon/
H A Dradeon_connectors.c254 struct drm_connector *conflict; local
[all...]
/freebsd-10-stable/contrib/ncurses/progs/
H A Dtic.c1362 bool conflict = FALSE; local
/freebsd-10-stable/contrib/subversion/subversion/libsvn_repos/
H A Dcommit.c756 const char *conflict; local
/freebsd-10-stable/contrib/diff/src/
H A Ddiff3.c1494 bool conflict; local
1611 bool conflict; local
[all...]

Completed in 286 milliseconds

12