merge: main → dev, resolve wire_push_stream conflict
main had the original work from the prior session: - migration 0052_object_refs_object_id_index.py (better docstring) - tests/test_push_stream_ghost_skip.py (P1-P6 tests for _check_missing_objects) - wire_push_stream phase 3b: _check_missing_objects instead of MinIO HEAD calls
dev re-created the same work this session (task/push-timing-clean). Resolution: take dev's wire_push_stream (has _tprog timing additions), drop the reconstructed 0052_index_object_refs_object_id.py in favor of the original 0052_object_refs_object_id_index.py from main.
Root cause of the data loss: work was committed to main, then a new branch was created from dev (which predated that main commit), so dev never got the changes. Merge now brings them in.
sha256:aae4369a1d32b305c90ec40003fa660620fa754a3471c947083a45fd61c96c65
sha
sha256:3aad25274086ae2524b4dedf0f783af8cf2ad628d72a85ef6b8988ed35b969bf
sha256:ca1ebb9cb6e4673fa0b75a7c53bab235ef61adaa7ae38885f591b5ad23c66378
parent
sha256:46d07bd24a5fc88251c21db44f095197f2a95db5d4eb4a2bc56b737ac3b7cf20
snapshot
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:aae4369a1d32b305c90ec40003fa660620fa754a3471c947083a45fd61c96c65 --body "your comment"
No comments yet. Be the first to start the discussion.