Home
last modified time | relevance | path

Searched refs:left_version (Results 1 – 5 of 5) sorted by relevance

/trueos/contrib/subversion/subversion/libsvn_wc/
HDconflicts.c1268 const svn_wc_conflict_version_t *left_version, in generate_propconflict() argument
1303 cdesc->src_left_version = left_version; in generate_propconflict()
1751 const svn_wc_conflict_version_t *left_version, in resolve_text_conflict() argument
1783 cdesc->src_left_version = left_version; in resolve_text_conflict()
1834 const svn_wc_conflict_version_t *left_version, in setup_tree_conflict_desc() argument
1843 if (left_version) in setup_tree_conflict_desc()
1844 tc_kind = left_version->node_kind; in setup_tree_conflict_desc()
1852 left_version, right_version, in setup_tree_conflict_desc()
1877 const svn_wc_conflict_version_t *left_version = NULL; in svn_wc__conflict_invoke_resolver() local
1887 left_version = APR_ARRAY_IDX(locations, 0, const svn_wc_conflict_version_t *); in svn_wc__conflict_invoke_resolver()
[all …]
HDmerge.c1210 const svn_wc_conflict_version_t *left_version, in svn_wc_merge5() argument
1367 left_version, in svn_wc_merge5()
HDprops.c186 const svn_wc_conflict_version_t *left_version, in svn_wc_merge_props3() argument
324 left_version, in svn_wc_merge_props3()
HDdeprecated.c4272 const svn_wc_conflict_version_t *left_version, in svn_wc_merge4() argument
4294 left_version, in svn_wc_merge4()
/trueos/contrib/subversion/subversion/include/
HDsvn_wc.h6841 const svn_wc_conflict_version_t *left_version,
6874 const svn_wc_conflict_version_t *left_version,
6993 const svn_wc_conflict_version_t *left_version,