Function conflict_on_overlapping_edits

atomic-core/src/merge/engine.rs:543–590

()

    #[test]
    fn conflict_on_overlapping_edits() {
        let mut txn = MockTxn::new();
        let store = MemoryChangeStore::new();

        // Base: "x = 1"
        let base_hash = make_change(&store, b"x = 1");
        let base_id = NodeId::new(1);
        txn.register(base_id, base_hash);

        // Left: "x = 2"
        let left_hash = make_change(&store, b"x = 2");
        let left_id = NodeId::new(2);
        txn.register(left_id, left_hash);

        // Right: "x = 3"
        let right_hash = make_change(&store, b"x = 3");
        let right_id = NodeId::new(3);
        txn.register(right_id, right_hash);

        let engine = SemanticMergeEngine::new(&txn, &store);

        let v_base = GraphNode::new(base_id, ChangePosition::new(0), ChangePosition::new(5));
        let v_left = GraphNode::new(left_id, ChangePosition::new(0), ChangePosition::new(5));
        let v_right = GraphNode::new(right_id, ChangePosition::new(0), ChangePosition::new(5));

        let group = ConflictGroup::new(vec![v_left, v_right]).with_ancestor(v_base);
        let outcome = engine.try_merge(&group).unwrap();

        assert!(
            outcome.is_conflict(),
            "expected Conflict, got {:?}",
            outcome,
        );
        if let MergeOutcome::Conflict {
            base,
            left,
            right,
            left_change,
            right_change,
        } = &outcome
        {
            assert_eq!(base, b"x = 1");
            assert_eq!(left, b"x = 2");
            assert_eq!(right, b"x = 3");
            assert_eq!(*left_change, left_id);
            assert_eq!(*right_change, right_id);
        }
    }

    // ---- SemanticMergeEngine: both sides same edit → AutoMerged -----------