Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# Changelog

## Unreleased
## [0.6.1] - 2026-11-10

- Guard the six-script R2 Fractal resync with immutable revisions, exact blobs and executable modes; expire the exception on the next oracle repin (#115).
### Added

- Rust legacy tree-record discovery preserves tree-tag-before-note ordering, exact record suffix identity and first-layout width filtering in SHA-1 and SHA-256 repositories. (#121, slice 3f-1)
- Rust legacy statement-shape validation covers decoded test records, zoned ISO calendar/week clocks, schema bool/float equality and integer-only exit codes. JSON byte decoding remains a separate port slice. (#122, slice 3f-2a)

### Changed

- Pin the immutable Python oracle to v0.6.0 and retire the first resync exception; retain the v0.5.0 oracle separately for the retired Python parity reporter's differential tests. (#120)
- Mirror six scripts and four policy/input fixtures verbatim from Fractal `787e8ed5`, including caller-side partial-clone hydration and signer refusal of missing objects. Guard the script resync with immutable revisions, exact blobs and executable modes until the next oracle repin. (#123, #124; exit tracking #115)

## [0.6.0] - 2026-11-10

Expand Down Expand Up @@ -122,3 +130,4 @@
[0.4.0]: https://github.com/compoundingtech/mergemaster/compare/v0.1.0...v0.4.0
[0.5.0]: https://github.com/compoundingtech/mergemaster/compare/v0.4.0...v0.5.0
[0.6.0]: https://github.com/compoundingtech/mergemaster/compare/v0.5.0...v0.6.0
[0.6.1]: https://github.com/compoundingtech/mergemaster/compare/v0.6.0...v0.6.1
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/mergemaster-evidence/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mergemaster-evidence"
version = "0.6.0"
version = "0.6.1"
edition = "2024"
description = "Portable signed gate observations in immutable Git notes"
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
let pkgs = import nixpkgs { inherit system; };
in pkgs.rustPlatform.buildRustPackage {
pname = "mergemaster";
version = "0.6.0";
version = "0.6.1";
src = pkgs.lib.cleanSource self;
cargoLock.lockFile = ./Cargo.lock;
nativeCheckInputs = [ pkgs.git pkgs.openssh pkgs.openssl pkgs.coreutils pkgs.python3 ];
Expand Down