Home
last modified time | relevance | path

Searched refs:right_nid (Results 1 – 6 of 6) sorted by relevance

/dports/devel/monotone/monotone-1.1/src/
H A Dmerge_roster.hh138 node_id left_nid, right_nid; member
145 dropped_modified_conflict(node_id left_nid, node_id right_nid) : in dropped_modified_conflict()
147 right_nid(right_nid), in dropped_modified_conflict()
157 right_nid(the_null_node), in dropped_modified_conflict()
166 bool operator==(node_id n) {return left_nid == n || right_nid == n;} in operator ==()
185 node_id left_nid, right_nid; member
194 bool operator==(node_id n) {return left_nid == n || right_nid == n;} in operator ==()
H A Dmerge_conflict.cc247 node_id & right_nid, in read_added_rename_conflict_right() argument
1107 nid = conflict.right_nid; in report_dropped_modified_conflicts()
1297 node_id left_nid, right_nid; in report_duplicate_name_conflicts() local
1300 right_nid = conflict.right_nid; in report_duplicate_name_conflicts()
1303 I(!roster.is_attached(right_nid)); in report_duplicate_name_conflicts()
1308 right_roster.get_name(right_nid, right_name); in report_duplicate_name_conflicts()
1351 if (!left_lca_roster->has_node(right_nid) && in report_duplicate_name_conflicts()
2199 merge_conflict.right_nid == file_conflict.right_nid, in validate_dropped_modified_conflicts()
2325 merge_conflict.right_nid == file_conflict.right_nid, in validate_duplicate_name_conflicts()
3113 if (conflict.right_nid != the_null_node) in resolve_dropped_modified_conflicts()
[all …]
H A Dmerge_roster.cc135 oss << " right_nid : " << conflict.right_nid << "\n"; in dump()
149 << "and right node: " << conflict.right_nid << " " in dump()
478 c.right_nid = result.roster.root()->self; in assign_name()
482 c.right_nid = nid; in assign_name()
545 c.right_nid = p->get_child(name)->self; in assign_name()
549 c.right_nid = nid; in assign_name()
841 right_parent.get_name(conflict.right_nid, modified_name); in roster_merge()
875 conflict.right_nid = right_node->self; in roster_merge()
880 conflict.right_nid = right_parent.get_node(modified_name)->self; in roster_merge()
881 nid = conflict.right_nid; in roster_merge()
H A Dcmd_conflicts.cc105 (conflict.right_nid != the_null_node && in show_conflicts()
113 conflicts.right_roster->get_name(conflict.right_nid, modified_name); in show_conflicts()
155 if (conflict.right_nid == the_null_node) in show_conflicts()
169 if (conflict.left_nid == the_null_node || conflict.right_nid == the_null_node) in show_conflicts()
206 if (conflict.right_nid != the_null_node && in show_conflicts()
477 E(conflict.right_nid != the_null_node, origin::user, in set_first_conflict()
618 E(conflict.right_nid == the_null_node, origin::user, in set_first_conflict()
/dports/devel/monotone/monotone-1.1/test/unit/tests/
H A Dmerge_roster.cc814 node_id left_nid, right_nid; member
819 right_nid = nis.next(); in setup()
820 make_dir(right_roster, right_markings, right_rid, right_rid, "thing", right_nid); in setup()
827 I(c.left_nid == left_nid && c.right_nid == right_nid); in check()
831 result.roster.attach_node(right_nid, file_path_internal("right")); in check()
1202 I(c.left_nid == left_root_nid && c.right_nid == right_root_nid); in check()
H A Droster.cc2109 node_id right_nid = right_erm.create_dir_node(); in create_random_unification_task() local
2110 right_erm.attach_node(right_nid, file_path()); in create_random_unification_task()
2130 node_id left_nid, right_nid; in create_random_unification_task() local
2134 right_nid = right_er->create_dir_node(); in create_random_unification_task()
2140 right_nid = right_er->create_file_node(fid); in create_random_unification_task()
2155 right_er->attach_node(right_nid, pth); in create_random_unification_task()