Lines Matching defs:conflict
241 const svn_wc_conflict_description2_t *conflict =
245 SVN_ERR(svn_cl__append_conflict_info_xml(sb, conflict, pool));
448 const svn_wc_conflict_description2_t *conflict =
453 switch (conflict->kind)
456 if (conflict->base_abspath)
460 path_prefix, conflict->base_abspath,
463 if (conflict->my_abspath)
467 path_prefix, conflict->my_abspath,
470 if (conflict->their_abspath)
474 path_prefix, conflict->their_abspath,
482 svn_dirent_local_style(conflict->their_abspath,
490 &desc, conflict, pool));
493 _("Tree conflict"), desc));
505 const svn_wc_conflict_description2_t *conflict =
510 svn_cl__node_description(conflict->src_left_version,
514 svn_cl__node_description(conflict->src_right_version,