Searched refs:left_version (Results 1 – 7 of 7) sorted by relevance
| /freebsd-12-stable/contrib/subversion/subversion/libsvn_wc/ |
| D | conflicts.c | 1182 const svn_wc_conflict_version_t *left_version, in generate_propconflict() argument
1206 cdesc->src_left_version = left_version; in generate_propconflict()
1789 const svn_wc_conflict_version_t *left_version, in read_text_conflict_desc() argument
1798 (*desc)->src_left_version = left_version; in read_text_conflict_desc()
1828 const svn_wc_conflict_version_t *left_version, in read_tree_conflict_desc() argument
1847 && left_version in read_tree_conflict_desc()
1854 local_kind = left_version->node_kind; in read_tree_conflict_desc()
1861 left_version, right_version, in read_tree_conflict_desc()
1900 const svn_wc_conflict_version_t *left_version = NULL; in svn_wc__conflict_invoke_resolver() local
1910 left_version = APR_ARRAY_IDX(locations, 0, const svn_wc_conflict_version_t *); in svn_wc__conflict_invoke_resolver()
[all …]
|
| D | wc_db_update_move.c | 4070 svn_wc_conflict_version_t **left_version, in fetch_conflict_details() argument
4120 if (left_version) in fetch_conflict_details()
4123 *left_version = APR_ARRAY_IDX(locations, 0, in fetch_conflict_details()
4126 *left_version = NULL; in fetch_conflict_details()
4233 svn_wc_conflict_version_t *left_version, *right_version; in svn_wc__db_op_raise_moved_away() local
4248 &left_version, &right_version, in svn_wc__db_op_raise_moved_away()
4257 left_version, right_version, in svn_wc__db_op_raise_moved_away()
4264 (left_version in svn_wc__db_op_raise_moved_away()
4265 ? left_version->peg_rev in svn_wc__db_op_raise_moved_away()
|
| D | merge.c | 1214 const svn_wc_conflict_version_t *left_version, in svn_wc_merge5() argument
1371 left_version, in svn_wc_merge5()
|
| D | props.c | 161 const svn_wc_conflict_version_t *left_version, in svn_wc_merge_props3() argument
299 left_version, in svn_wc_merge_props3()
|
| D | deprecated.c | 4566 const svn_wc_conflict_version_t *left_version, in svn_wc_merge4() argument
4588 left_version, in svn_wc_merge4()
|
| /freebsd-12-stable/contrib/subversion/subversion/include/ |
| D | svn_wc.h | 7021 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-stable/contrib/subversion/subversion/libsvn_client/ |
| D | conflicts.c | 7364 const svn_wc_conflict_version_t *left_version; in raise_tree_conflict() local
7367 left_version = svn_wc_conflict_version_create2(repos_root_url, in raise_tree_conflict()
7382 left_version, in raise_tree_conflict()
7426 const svn_wc_conflict_version_t *left_version; in merge_added_dir_props() local
7430 left_version = svn_wc_conflict_version_create2( in merge_added_dir_props()
7455 left_version, right_version, in merge_added_dir_props()
|