experiments: reproducible merge for issue #1 (does Live open a Wit merge?) - #31
Merged
Conversation
Everything in this project is downstream of one unverified assumption: that a file Wit produces (merged, or just decompressed/recompressed) is a file Ableton Live will actually open. EXPERIMENTS.md §5 produced a clean 3-way merge but never launched a DAW to check that. This script reproduces that merge from a real project's Backup/ chain (two adjacent real saves for the "ancestor" and "Alice", a synthesized single-value volume edit on a disjoint track for "Bob"), plus a round-trip-only file (gunzip/gzip, no edits) to isolate repack corruption from merge corruption per the issue's own reasoning. Verified end-to-end against a real local Ableton backup chain in this session: merge exit 0, output diffs from Alice's real save by exactly the one synthesized line, both outputs parse as valid XML. Opening the result in actual Ableton Live is a one-time human step this script deliberately does not automate (no DAW automation, per SECURITY.md's scope) — the generated .als files are not committed, only the tool. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Progress on #1, not a close — the last step (actually opening the file in Ableton Live)
is a one-time human act this intentionally does not automate.
What this adds
experiments/reproduce_merge_daw_acceptance.py: reproduces the EXPERIMENTS.md §53-way merge against your own real project's
Backup/chain instead of ahardcoded/fabricated example. Given two adjacent real saves (ancestor + "Alice"'s real
edit), it synthesizes a single, disjoint volume-value edit ("Bob") on a track Alice's
edit didn't touch, 3-way merges via
git merge-file, and also emits a round-trip-onlyfile (gunzip → gzip, zero edits) to isolate repack corruption from merge corruption —
straight from the issue's own reasoning ("if round-tripping alone corrupts a set, that
is a much more fundamental problem than merge semantics").
Verified this session, against a real local Ableton backup chain
git merge-fileexit 0 (clean merge, no conflict markers)edits present, nothing else touched
merged.alsandroundtrip.alsparse as valid XMLruff checkclean, no personal paths leaked (check_personal_paths.pyclean)Not verified here, and can't be: whether Ableton Live actually opens either file.
No DAW automation exists in this repo on purpose (SECURITY.md's scope) — that's a
one-time manual check for whoever has Live installed, per the issue's own 4-item
checklist. The generated
.alsfiles are derived from real personal project data andare correctly not committed — only the tool is.
🤖 Generated with Claude Code