gabriel / muse public
test task/phase1-merge-engine #12 / 16
AI Agent gabriel · 16 hours ago · Jun 11, 2026 · Diff

test: add Phase 2 conflict granularity tests (CE_01-04, DE_01-04, DIR_01)

sha256:e8b20c39f3247608af4212654b5c6476cec7034bc40f8a3eb714b7b4bfc41b7f sha
sha256:c2e22a54a80ab87150301919c6ac33c0bbafeb39840df86bfbef413147165feb parent
+32 symbols
sha256:3cfa28a85cb89bf1af022e16ec6b37ebd603be65ad4fc45906a68142128b4b48 snapshot
+32
symbols added
0
dead code introduced
Semantic Changes 32 symbols
~ tests/test_phase2_conflict_granularity.py .py 32 symbols added
+ TestConvergentEdits class class TestConvergentEdits L130–281
+ test_CE_01_untouched_file_no_conflict method method test_CE_01_untouched_file_no_conflict L133–161
+ test_CE_02_convergent_edit_no_conflict method method test_CE_02_convergent_edit_no_conflict L163–197
+ test_CE_03_convergent_symbol_no_conflict method method test_CE_03_convergent_symbol_no_conflict L199–242
+ test_CE_04_both_deleted_no_conflict method method test_CE_04_both_deleted_no_conflict L244–281
+ TestDirectoryLevel class class TestDirectoryLevel L417–484
+ test_DIR_01_delete_modify_inside_directory method method test_DIR_01_delete_modify_inside_directory L420–484
+ TestDivergentEdits class class TestDivergentEdits L288–410
+ test_DE_01_file_divergence_detected method method test_DE_01_file_divergence_detected L291–315
+ test_DE_02_symbol_divergence_detected method method test_DE_02_symbol_divergence_detected L317–354
+ test_DE_03_add_add_collision_detected method method test_DE_03_add_add_collision_detected L356–382
+ test_DE_04_delete_modify_conflict_detected method method test_DE_04_delete_modify_conflict_detected L384–410
+ _checkout function function _checkout L100–109
+ _env function function _env L34–35
+ _init_repo function function _init_repo L38–53
+ _make_commit function function _make_commit L62–97
+ _merged_snapshot function function _merged_snapshot L112–123
+ _write_obj function function _write_obj L56–59
+ cli variable variable cli L27–27
+ CliRunner import import CliRunner L21–21
+ annotations import import annotations L14–14
+ blob_id import import blob_id L22–22
+ datetime import import datetime L16–16
+ fake_id import import fake_id L22–22
+ heads_dir import import heads_dir L24–24
+ json import import json L17–17
+ muse_dir import import muse_dir L24–24
+ pathlib import import pathlib L18–18
+ pytest import import pytest L20–20
+ ref_path import import ref_path L24–24
+ write_object import import write_object L23–23
+ runner variable variable runner L26–26
Older feat: add merge_result sub-object to muse merge --json (deliverable 5) sha256:c2e22a54a80ab87150301919c6ac33c0bbafeb39840df86bfbef413147165feb All commits Newer test(phase3): full strategy matrix — 24 SM tests, rebase→linear sha256:f02589f8e157757da430d82f35a64c0b7eee5033f6d13076ea395f9942151790

0 comments

No comments yet. Be the first to start the discussion.

To add a comment, use the Muse CLI: muse hub commit comment sha256:e8b20c39f3247608af4212654b5c6476cec7034bc40f8a3eb714b7b4bfc41b7f --body "your comment"