Contrib.social

Merge both v4 branches into a single one, & then cut a new release

Open on Drupal.org →
Created on 30 June 2025, 26 days ago

4.0.24 was tagged off 4.0.x, but the default branch is 4.x. I expected these to be the same, but they're not.

Looking at the repository graph:

And here's proof that the code differs:

% git diff 4.x..4.0.x src/Service/EnvironmentIndicator.php
diff --git a/src/Service/EnvironmentIndicator.php b/src/Service/EnvironmentIndicator.php
index 9eee13f..f823d1c 100644
--- a/src/Service/EnvironmentIndicator.php
+++ b/src/Service/EnvironmentIndicator.php
@@ -61,7 +61,7 @@ class EnvironmentIndicator {
     ConfigFactoryInterface $config_factory,
     EntityTypeManagerInterface $entity_type_manager,
     StateInterface $state,
-    Settings $settings,
+    Settings $settings
   ) {
     $this->configFactory = $config_factory;
     $this->entityTypeManager = $entity_type_manager;

This caused my some problems with 💬 Granular permissions are not working as expected. Active , as different patches were required.

To fix, merge one branch into the other, and cut a new release. I can't see a good reason for having 2 branches here; it's very confusing.

📌 Task
Status

Active

Version

4.0

Component

Code

Created by

🇨🇦Canada colan Toronto 🇨🇦

Live updates comments and jobs are added and updated live.
Sign in to follow issues

Comments & Activities

  • Issue created by @colan
  • Comment 16 days ago →
    🇺🇸United States trackleft2 Tucson, AZ 🇺🇸

    Thank you for raising this. The 4.x branch is intended for the next minor release, which includes backward-incompatible changes such as dropping support for older versions of Drupal core and PHP. In contrast, 4.0.24 and its predecessors are part of the current patch release line, which maintains backward compatibility.

    Because the two branches have diverged significantly, we cannot merge them without introducing breaking changes into the stable line. However, we’re happy to help by:

    • Providing updated patches for existing issues that apply cleanly to the latest supported stable version.
    • Assisting with forward-porting changes as needed to ensure compatibility with the current development line.

    Let us know if there’s a specific patch or issue you’re running into trouble with—we’re happy to help resolve it.

contrib.social Blog FAQ Discussions
Production build 0.71.5 2024