From 291d159c61dac0e7bebe6442adac219725810cf1 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 4 Oct 2026 13:26:05 -0400 Subject: [PATCH 1/3] fix: point Rust family link at consolidated repository --- gems/kettle-jem/CHANGELOG.md | 2 ++ gems/kettle-jem/lib/kettle/jem.rb | 2 +- .../spec/integration/readme_changelog_template_spec.rb | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gems/kettle-jem/CHANGELOG.md b/gems/kettle-jem/CHANGELOG.md index a9d360611..350a29b36 100644 --- a/gems/kettle-jem/CHANGELOG.md +++ b/gems/kettle-jem/CHANGELOG.md @@ -151,6 +151,8 @@ Please file a bug if you notice a violation of semantic versioning. - Avoid duplicate rubocop-packaging declarations when local style Gemfiles are evaluated. +- The StructuredMerge family link in generated READMEs now points to the consolidated StructuredMerge repository. + ### Security ## [7.1.28] - 2026-09-10 diff --git a/gems/kettle-jem/lib/kettle/jem.rb b/gems/kettle-jem/lib/kettle/jem.rb index e08e516f7..225b357c7 100644 --- a/gems/kettle-jem/lib/kettle/jem.rb +++ b/gems/kettle-jem/lib/kettle/jem.rb @@ -14849,7 +14849,7 @@ def readme_family_intro_and_backend_matrix(readme_style = {}) "[sm-family-fixtures]: https://github.com/structuredmerge/structuredmerge-fixtures", "[sm-family-go]: https://github.com/structuredmerge/structuredmerge-go", "[sm-family-ruby]: https://github.com/structuredmerge/structuredmerge-ruby", - "[sm-family-rust]: https://github.com/structuredmerge/structuredmerge-rust", + "[sm-family-rust]: https://github.com/structuredmerge/structuredmerge", "[sm-family-typescript]: https://github.com/structuredmerge/structuredmerge-typescript" ].join("\n") end diff --git a/gems/kettle-jem/spec/integration/readme_changelog_template_spec.rb b/gems/kettle-jem/spec/integration/readme_changelog_template_spec.rb index 28b284777..e322c3069 100644 --- a/gems/kettle-jem/spec/integration/readme_changelog_template_spec.rb +++ b/gems/kettle-jem/spec/integration/readme_changelog_template_spec.rb @@ -1341,6 +1341,7 @@ module Version expect(funding).not_to include("opencollective") expect(readme).not_to include("Apache SkyWalking Eyes License Compatibility Check") expect(readme).to include("https://github.com/structuredmerge/structuredmerge-ruby#package-family") + expect(readme).to include("https://github.com/structuredmerge/structuredmerge") expect(readme).to include("root package-family guide") expect(readme).to include("https://github.com/structuredmerge/structuredmerge-ruby/actions/workflows/current.yml") expect(readme).not_to include("https://github.com/structuredmerge/ast-merge/actions/workflows/current.yml") From b8df0b7af81e24eaa694c5a0551933a410caabf3 Mon Sep 17 00:00:00 2001 From: "Peter H. Boling" Date: Sun, 4 Oct 2026 14:48:40 -0400 Subject: [PATCH 2/3] docs: sync generated Rust family link --- gems/kettle-jem/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/kettle-jem/README.md b/gems/kettle-jem/README.md index 35b45c496..190a04c7b 100644 --- a/gems/kettle-jem/README.md +++ b/gems/kettle-jem/README.md @@ -95,7 +95,7 @@ Merge analysis must enter parsing through `tree_haver`. Parser-specific gems reg [sm-family-fixtures]: https://github.com/structuredmerge/structuredmerge-fixtures [sm-family-go]: https://github.com/structuredmerge/structuredmerge-go [sm-family-ruby]: https://github.com/structuredmerge/structuredmerge-ruby -[sm-family-rust]: https://github.com/structuredmerge/structuredmerge-rust +[sm-family-rust]: https://github.com/structuredmerge/structuredmerge [sm-family-typescript]: https://github.com/structuredmerge/structuredmerge-typescript ### Federated DVCS From c76dd823d79d36d5f54b60ae6bf2764d9c0638d5 Mon Sep 17 00:00:00 2001 From: "|7eter l-|. l3oling" Date: Mon, 5 Oct 2026 01:57:23 +0700 Subject: [PATCH 3/3] Update README expectations in changelog spec Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../spec/integration/readme_changelog_template_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gems/kettle-jem/spec/integration/readme_changelog_template_spec.rb b/gems/kettle-jem/spec/integration/readme_changelog_template_spec.rb index e322c3069..414a4480d 100644 --- a/gems/kettle-jem/spec/integration/readme_changelog_template_spec.rb +++ b/gems/kettle-jem/spec/integration/readme_changelog_template_spec.rb @@ -1341,7 +1341,7 @@ module Version expect(funding).not_to include("opencollective") expect(readme).not_to include("Apache SkyWalking Eyes License Compatibility Check") expect(readme).to include("https://github.com/structuredmerge/structuredmerge-ruby#package-family") - expect(readme).to include("https://github.com/structuredmerge/structuredmerge") + expect(readme).to include("[sm-family-rust]: https://github.com/structuredmerge/structuredmerge") expect(readme).to include("root package-family guide") expect(readme).to include("https://github.com/structuredmerge/structuredmerge-ruby/actions/workflows/current.yml") expect(readme).not_to include("https://github.com/structuredmerge/ast-merge/actions/workflows/current.yml")