| /dports/devel/monotone/monotone-1.1/src/ |
| H A D | merge_roster.hh | 142 revision_id left_rid, right_rid; member
150 right_rid(), in dropped_modified_conflict()
160 right_rid(), in dropped_modified_conflict()
358 revision_id & right_rid,
369 revision_id const & right_rid,
391 revision_id const & right_rid,
|
| H A D | merge_conflict.cc | 144 db_adaptor.db.get_file_content (db_adaptor.right_rid, nid, fid); in put_added_conflict_right()
2064 conflict.right_rid = right_rid; in read_dropped_modified_conflict()
2072 conflict.right_rid = right_rid; in read_dropped_modified_conflict()
2204 merge_conflict.right_rid = file_conflict.right_rid; in validate_dropped_modified_conflicts()
2556 revision_id right_rid, in read_conflict_file_core() argument
2613 revision_id & right_rid, in read_conflict_file() argument
2646 db.get_roster(right_rid, right_roster, right_marking); in read_conflict_file()
2677 adaptor.cache_roster (right_rid, right_roster); in write_conflict_file()
2683 st.push_binary_pair(syms::right, right_rid.inner()); in write_conflict_file()
2708 revision_id const & right_rid, in parse_resolve_conflicts_opts() argument
[all …]
|
| H A D | cmd_merging.cc | 73 MM(right_rid); in three_way_merge()
117 safe_insert(right_uncommon_ancestors, right_rid); in three_way_merge()
120 P(F("[right] %s") % right_rid); in three_way_merge()
678 revision_id const & left_rid(*src_i), & right_rid(*dst_i); in perform_merge_into_dir() local
689 db.get_uncommon_ancestors(left_rid, right_rid, in perform_merge_into_dir()
743 left_rid, right_rid, merged); in perform_merge_into_dir()
1124 revision_id & right_rid) in get_conflicts_rids() argument
1141 right_rid = p.second; in get_conflicts_rids()
1237 revision_id right_rid; variable
1238 complete(app.opts, app.lua, project, idx(args,2)(), right_rid);
[all …]
|
| H A D | merge_content.cc | 48 : db(db), left_rid (left), right_rid (right), left_mm(left_mm), right_mm(right_mm), in content_merge_database_adaptor()
823 revision_id const & right_rid, in interactive_merge_and_store() argument
831 db.get_roster(right_rid, right_roster, right_marking_map); in interactive_merge_and_store()
832 db.get_uncommon_ancestors(left_rid, right_rid, in interactive_merge_and_store()
843 content_merge_database_adaptor dba(db, left_rid, right_rid, in interactive_merge_and_store()
847 …parse_resolve_conflicts_opts (opts, left_rid, left_roster, right_rid, right_roster, result, resolu… in interactive_merge_and_store()
854 left_rid, right_rid, merged_rid); in interactive_merge_and_store()
863 revision_id const & right_rid, in store_roster_merge_result() argument
881 safe_insert(merged_rev.edges, make_pair(right_rid, right_to_merged)); in store_roster_merge_result()
|
| H A D | ancestry.cc | 601 revision_id const & right_rid = edge_old_revision(i); in make_roster_for_merge() local
604 I(!null_id(left_rid) && !null_id(right_rid)); in make_roster_for_merge()
607 db.get_roster(right_rid, right_cached); in make_roster_for_merge()
610 db.get_uncommon_ancestors(left_rid, right_rid, in make_roster_for_merge()
616 right_rid, *right_cached.first, *right_cached.second, in make_roster_for_merge()
|
| H A D | merge_content.hh | 60 revision_id right_rid; member
319 revision_id const & right_rid,
|
| H A D | cmd_conflicts.cc | 25 revision_id ancestor_rid, left_rid, right_rid; member
37 result.read_conflict_file(db, file, ancestor_rid, left_rid, right_rid, in conflicts_t()
45 (db, lua, file, ancestor_rid, left_rid, right_rid, in write()
316 … (db, conflicts.left_rid, conflicts.right_rid, conflicts.left_marking, conflicts.right_marking, in show_conflicts()
|
| H A D | roster.hh | 460 revision_id const & right_rid,
|
| H A D | roster.cc | 2071 revision_id const & right_rid, in make_roster_for_merge() argument
2082 I(!null_id(left_rid) && !null_id(right_rid)); in make_roster_for_merge()
2084 I(left_uncommon_ancestors.find(right_rid) == left_uncommon_ancestors.end()); in make_roster_for_merge()
2085 I(right_uncommon_ancestors.find(right_rid) != right_uncommon_ancestors.end()); in make_roster_for_merge()
2092 MM(right_rid); in make_roster_for_merge()
|
| H A D | merge_roster.cc | 138 oss << " right_rid : " << conflict.right_rid << "\n"; in dump()
|
| /dports/devel/monotone/monotone-1.1/test/unit/tests/ |
| H A D | merge_roster.cc | 772 revision_id old_rid, left_rid, right_rid; member
791 right_rid = *right_revs.begin(); in test()
820 make_dir(right_roster, right_markings, right_rid, right_rid, "thing", right_nid); in setup()
889 …make_dir(right_roster, right_markings, right_rid, right_rid, "a_parent/a_child", a_live_child_nid); in setup()
940 make_dir(right_roster, right_markings, right_rid, right_rid, "root_to_be/_MTN", bad_dir_nid); in setup()
1050 make_dir(right_roster, right_markings, right_rid, right_rid, "a", a_nid); in setup()
1072 make_dir(right_roster, right_markings, old_rid, right_rid, "b", b_nid); in setup()
1095 make_dir(right_roster, right_markings, old_rid, right_rid, "b/foo/a", a_nid); in setup()
1115 make_dir(right_roster, right_markings, old_rid, right_rid, "", new_root_nid); in setup()
1143 make_dir(right_roster, right_markings, old_rid, right_rid, "", right_root_nid); in setup()
[all …]
|
| H A D | roster.cc | 1194 right_uncommon_ancestors.insert(right_rid); in run_with_2_roster_parents()
1246 return right_rid; in flip_revision_id()
1247 else if (rid == right_rid) in flip_revision_id()
1600 run_with_2_roster_parents(s, right_rid, in UNIT_TEST()
1609 run_with_2_roster_parents(s, right_rid, in UNIT_TEST()
1668 singleton(right_rid), in UNIT_TEST()
1674 singleton(right_rid), in UNIT_TEST()
1730 singleton(right_rid), in UNIT_TEST()
1738 singleton(right_rid), in UNIT_TEST()
2204 revision_id has_not_rid = right_rid; in UNIT_TEST()
[all …]
|