Searched refs:conflicted_range (Results 1 – 2 of 2) sorted by relevance
1239 const merge_source_t *conflicted_range; member
5471 merge_source_t *conflicted_range; member5481 single_range_conflict_report_create(const merge_source_t *conflicted_range, in single_range_conflict_report_create() argument5488 assert(conflicted_range != NULL); in single_range_conflict_report_create()5490 report->conflicted_range = merge_source_dup(conflicted_range, result_pool); in single_range_conflict_report_create()5501 const merge_source_t *conflicted_range, in conflict_report_create() argument5509 report->conflicted_range = merge_source_dup(conflicted_range, result_pool); in conflict_report_create()5523 new->conflicted_range = merge_source_dup(report->conflicted_range, in conflict_report_dup()5541 report->conflicted_range->loc1->rev, report->conflicted_range->loc2->rev, in svn_client__make_merge_conflict_error()5543 …assert(report->conflicted_range->loc1->rev != report->conflicted_range->loc2->rev); /* ### is a va… in svn_client__make_merge_conflict_error()10029 target->abspath, conflicted_range_report->conflicted_range, in do_merge()