Home
last modified time | relevance | path

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

/freebsd-12.1/contrib/subversion/subversion/libsvn_wc/
H A Dconflicts.c1148 const svn_wc_conflict_version_t *left_version, in generate_propconflict() argument
1172 cdesc->src_left_version = left_version; in generate_propconflict()
1755 const svn_wc_conflict_version_t *left_version, in read_text_conflict_desc() argument
1764 (*desc)->src_left_version = left_version; in read_text_conflict_desc()
1813 && left_version in read_tree_conflict_desc()
1820 local_kind = left_version->node_kind; in read_tree_conflict_desc()
1866 const svn_wc_conflict_version_t *left_version = NULL; in svn_wc__conflict_invoke_resolver() local
1931 left_version, in svn_wc__conflict_invoke_resolver()
2123 desc->src_left_version = left_version; in read_prop_conflict_descs()
2155 desc->src_left_version = left_version; in read_prop_conflict_descs()
[all …]
H A Dwc_db_update_move.c4063 svn_wc_conflict_version_t **left_version, in fetch_conflict_details() argument
4113 if (left_version) in fetch_conflict_details()
4116 *left_version = APR_ARRAY_IDX(locations, 0, in fetch_conflict_details()
4119 *left_version = NULL; in fetch_conflict_details()
4226 svn_wc_conflict_version_t *left_version, *right_version; in svn_wc__db_op_raise_moved_away() local
4241 &left_version, &right_version, in svn_wc__db_op_raise_moved_away()
4250 left_version, right_version, in svn_wc__db_op_raise_moved_away()
4257 (left_version in svn_wc__db_op_raise_moved_away()
4258 ? left_version->peg_rev in svn_wc__db_op_raise_moved_away()
H A Dmerge.c1214 const svn_wc_conflict_version_t *left_version, in svn_wc_merge5() argument
1371 left_version, in svn_wc_merge5()
H A Dprops.c161 const svn_wc_conflict_version_t *left_version, in svn_wc_merge_props3() argument
299 left_version, in svn_wc_merge_props3()
H A Ddeprecated.c4540 const svn_wc_conflict_version_t *left_version, in svn_wc_merge4() argument
4562 left_version, in svn_wc_merge4()
/freebsd-12.1/contrib/subversion/subversion/include/
H A Dsvn_wc.h7021 const svn_wc_conflict_version_t *left_version,
7054 const svn_wc_conflict_version_t *left_version,
7173 const svn_wc_conflict_version_t *left_version,
/freebsd-12.1/contrib/subversion/subversion/libsvn_client/
H A Dconflicts.c7112 const svn_wc_conflict_version_t *left_version; in raise_tree_conflict() local
7115 left_version = svn_wc_conflict_version_create2(repos_root_url, in raise_tree_conflict()
7130 left_version, in raise_tree_conflict()
7174 const svn_wc_conflict_version_t *left_version; in merge_added_dir_props() local
7178 left_version = svn_wc_conflict_version_create2( in merge_added_dir_props()
7203 left_version, right_version, in merge_added_dir_props()