()
| 604 | |
| 605 | #[test] |
| 606 | fn skips_three_way_conflicts() { |
| 607 | let mut txn = MockTxn::new(); |
| 608 | let store = MemoryChangeStore::new(); |
| 609 | let hash = make_change(&store, b"abcdefghijklmnop"); |
| 610 | let id = NodeId::new(1); |
| 611 | txn.register(id, hash); |
| 612 | let engine = SemanticMergeEngine::new(&txn, &store); |
| 613 | |
| 614 | let v1 = GraphNode::new(id, ChangePosition::new(0), ChangePosition::new(5)); |
| 615 | let v2 = GraphNode::new(id, ChangePosition::new(5), ChangePosition::new(10)); |
| 616 | let v3 = GraphNode::new(id, ChangePosition::new(10), ChangePosition::new(15)); |
| 617 | |
| 618 | let group = ConflictGroup::new(vec![v1, v2, v3]); |
| 619 | let outcome = engine.try_merge(&group).unwrap(); |
| 620 | assert!(matches!(outcome, MergeOutcome::NoCrdtData)); |
| 621 | } |
| 622 | |
| 623 | // ---- SemanticMergeEngine: no ancestor → NoCrdtData -------------------- |
| 624 |
nothing calls this directly
no test coverage detected