Function auto_merge_non_overlapping_edits

atomic-core/src/merge/engine.rs:613–650

()

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

        // Base content: "host: localhost, port: 3000"
        let base_hash = make_change(&store, b"host: localhost, port: 3000");
        let base_id = NodeId::new(1);
        txn.register(base_id, base_hash);

        // Left changes host: "host: production, port: 3000"
        let left_hash = make_change(&store, b"host: production, port: 3000");
        let left_id = NodeId::new(2);
        txn.register(left_id, left_hash);

        // Right changes port: "host: localhost, port: 8080"
        let right_hash = make_change(&store, b"host: localhost, port: 8080");
        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(27));
        let v_left = GraphNode::new(left_id, ChangePosition::new(0), ChangePosition::new(28));
        let v_right = GraphNode::new(right_id, ChangePosition::new(0), ChangePosition::new(27));

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

        assert!(
            outcome.is_auto_merged(),
            "expected AutoMerged, got {:?}",
            outcome,
        );
        assert_eq!(
            std::str::from_utf8(outcome.content()).unwrap(),
            "host: production, port: 8080",
        );
    }

    // ---- SemanticMergeEngine: conflict on same token -----------------------