Searched refs:left_marks (Results 1 – 3 of 3) sorted by relevance
| /dports/devel/monotone/monotone-1.1/src/ |
| H A D | merge_roster.cc | 301 set<revision_id> const & left_marks, in merge_scalar() argument
314 MM(left_marks); in merge_scalar()
319 bool right_wins = a_wins(left_marks, left_uncommon_ancestors); in merge_scalar()
|
| H A D | roster.cc | 1603 mark_merged_scalar(set<revision_id> const & left_marks, in mark_merged_scalar() argument
1621 for (set<revision_id>::const_iterator i = left_marks.begin(); in mark_merged_scalar()
1622 i != left_marks.end(); ++i) in mark_merged_scalar()
1632 mark_won_merge(left_marks, left_uncommon_ancestors, right_marks, in mark_merged_scalar()
1636 mark_won_merge(right_marks, right_uncommon_ancestors, left_marks, in mark_merged_scalar()
1661 set_union(left_marks.begin(), left_marks.end(), in mark_merged_scalar()
|
| /dports/devel/monotone/monotone-1.1/test/unit/tests/ |
| H A D | merge_roster.cc | 147 set<revision_id> left_marks, right_marks; in test_a_scalar_merge_impl() local
155 MM(left_marks); in test_a_scalar_merge_impl()
159 string_to_set(left_marks_str, left_marks); in test_a_scalar_merge_impl()
160 scalar.setup_parent(left_val, left_marks, left_parent, left_markings); in test_a_scalar_merge_impl()
|