The changes for the three most recent tags (3.3.6, 3.3.7, 3.3.8) have not been merged into either the 3.0.x or 3.x branches. As a result, when we create merge requests against either branch they cannot be applied against our local up-to-date installations.

Please update the appropriate branch(es) so that we can update our merge requests to be accurate and usable locally.

Thank you.

Comments

damienmckenna created an issue. See original summary.

jsacksick’s picture

Category: Bug report » Support request
Priority: Major » Minor
Status: Active » Postponed (maintainer needs more info)

@damienmckenna: I'm not sure what you're reporting TBH? Can you elaborate? Tell me which commits aren't in there? What's in 3.3.8 is in 3.x?
3.x is the branch actively maintained, not 3.0.x.

damienmckenna’s picture

Title: Fix 3.x, 3.0.x branches » 3.x branch doesn't have changes from 3.3.6, 3.3.7, 3.3.8
Issue summary: View changes
Status: Postponed (maintainer needs more info) » Active

I pulled down the latest 3.x branch and this is what I see:

$ git pull
Already up to date.

$ git log
commit f25c6badab74e90fa0c206275f39714a8eacc94f (HEAD -> 3.x, commerce-2871483/3.x)
Author: Julian Pustkuchen <3110-Anybody@users.noreply.drupalcode.org>
Date:   Fri May 8 11:11:23 2026 +0000

    fix: #3587604 Circular reference detected for service "Drupal\Core\Logger\LoggerChannelFactoryInterface"
    
    By: anybody
    By: jsacksick
    By: davidwhthomas

commit e0cf8a64fc2258a75c40d36f725a6bf3abaa0bd5
Author: Jonathan Sacksick <jonathan.sacksick@gmail.com>
Date:   Thu Apr 23 17:00:37 2026 +0300

    Strong type the entity type manager in OrderTotal.

commit 2610ac0186645b23d4ae756fda2bc62b4fd8d2c2
Author: Jonathan Sacksick <jonathan.sacksick@gmail.com>
Date:   Tue Apr 21 08:44:46 2026 +0300

    Remove an unused use statement.

commit feca756cab02b409bc3be11f24db7f4b511b51f3 (tag: 3.3.5)
Author: Dmytrii Kaiun <41040-tBKoT@users.noreply.drupalcode.org>
Date:   Mon Apr 20 15:50:24 2026 +0000

    Resolve failed test in Drupal 11.4

$ git merge 3.3.8
Updating f25c6bad..a6905f48
Fast-forward
 commerce.libraries.yml                                                      |  2 +
 commerce.services.yml                                                       |  5 +++
 drupalci.yml                                                                | 19 --------
 modules/cart/src/CartManager.php                                            | 21 ++++-----
 modules/cart/src/Plugin/QueueWorker/CartExpiration.php                      | 49 +++++----------------
 modules/cart/templates/commerce-cart-block.html.twig                        |  2 +-
 modules/cart/tests/src/Kernel/CartExpirationTest.php                        | 23 ++++------
 modules/checkout/src/Plugin/Block/CheckoutProgressBlock.php                 | 44 ++++++++++---------
 modules/checkout/src/Plugin/Commerce/CheckoutPane/CustomerComments.php      |  8 +++-
 modules/checkout/tests/src/Functional/CheckoutOrderTest.php                 |  9 ++--
 modules/checkout/tests/src/Kernel/CheckoutAccessTest.php                    | 12 ++---
 modules/log/commerce_log.module                                             | 18 ++++++++
 modules/log/src/EventSubscriber/CartEventSubscriber.php                     | 27 ++++++------
 modules/log/src/EventSubscriber/CheckoutEventSubscriber.php                 | 21 ++++-----
 modules/log/src/EventSubscriber/OrderEventSubscriber.php                    | 24 +++++-----
 modules/log/src/EventSubscriber/PaymentEventSubscriber.php                  | 32 +++++++++-----
 modules/log/src/Hook/CommerceLogHooks.php                                   | 75 ++++++++++++++++++++++++++++++++
 modules/log/tests/src/Functional/FailedPaymentTest.php                      | 10 ++---
 modules/log/tests/src/Kernel/CartIntegrationTest.php                        | 26 +++++------
 modules/log/tests/src/Kernel/CheckoutIntegrationTest.php                    | 13 ++----
 modules/log/tests/src/Kernel/OrderIntegrationTest.php                       | 36 ++++++++-------
 modules/log/tests/src/Kernel/PaymentIntegrationTest.php                     | 48 +++++++++++---------
 modules/number_pattern/src/NumberPatternListBuilder.php                     | 39 ++++++-----------
 modules/order/commerce_order.module                                         |  5 ++-
 modules/order/css/commerce_order.admin-order.css                            | 11 +++--
 modules/order/src/Controller/AddressBookController.php                      | 53 ++++++++++------------
 modules/order/src/Form/CustomerFormTrait.php                                | 15 ++++---
 modules/order/src/Form/OrderAddForm.php                                     | 50 +++------------------
 modules/order/src/Form/OrderForm.php                                        | 23 ++++++++++
 modules/order/src/Form/OrderReassignForm.php                                | 42 +++++-------------
 modules/order/src/Hook/CommerceOrderHooks.php                               |  3 +-
 modules/order/src/OrderListBuilder.php                                      | 52 ++++++++++------------
 modules/order/src/OrderRefresh.php                                          | 53 ++++++----------------
 modules/order/src/Plugin/Field/FieldWidget/OrderItemsWidget.php             | 17 +++++---
 modules/order/src/PriceSplitter.php                                         | 25 +++--------
 modules/order/src/Resolver/DefaultOrderTypeResolver.php                     | 16 +++----
 modules/order/templates/commerce-order--admin.html.twig                     |  2 +-
 modules/order/templates/commerce-order-receipt.html.twig                    |  2 +-
 modules/order/tests/src/FunctionalJavascript/AddressBookTest.php            |  3 ++
 modules/order/tests/src/FunctionalJavascript/OrderAdminTest.php             | 87 ++++++++++++++++++++++++++++++-------
 modules/order/tests/src/Kernel/OrderReceiptTest.php                         |  4 ++
 modules/order/tests/src/Kernel/OrderRefreshTest.php                         | 34 +++++++++------
 modules/payment/commerce_payment.module                                     |  5 ++-
 modules/payment/commerce_payment.routing.yml                                |  2 +-
 modules/payment/config/schema/commerce_payment.schema.yml                   |  7 +++
 modules/payment/src/Form/OrderPaymentAddForm.php                            | 27 +++++++++---
 modules/payment/src/Hook/CommercePaymentHooks.php                           |  3 +-
 modules/payment/src/PaymentListBuilder.php                                  | 50 ++++++---------------
 modules/payment/src/PaymentMethodListBuilder.php                            |  2 +-
 .../src/Plugin/Field/FieldFormatter/PaymentMethodProfileFormatter.php       |  2 +-
 modules/payment/src/PluginForm/PaymentMethodFormBase.php                    | 12 +++++
 modules/payment/tests/src/Functional/PaymentMethodTest.php                  | 18 +++-----
 modules/payment/tests/src/Kernel/FilterPaymentGatewaysEventTest.php         | 22 ++++------
 modules/payment/tests/src/Kernel/PaymentMethodStorageTest.php               | 28 +++++-------
 modules/price/src/CurrencyImporter.php                                      | 35 +++++----------
 modules/price/src/Element/Price.php                                         | 23 ++++++++--
 modules/price/src/Form/CurrencyForm.php                                     | 29 +++----------
 modules/price/src/Plugin/Field/FieldFormatter/PricePlainFormatter.php       | 48 +++-----------------
 modules/price/src/Repository/CurrencyRepository.php                         | 21 +++------
 modules/price/src/Rounder.php                                               | 17 +++-----
 modules/product/commerce_product.module                                     |  5 ++-
 modules/product/src/Form/ProductTypeForm.php                                | 39 +++--------------
 modules/product/src/Hook/CommerceProductHooks.php                           |  3 +-
 modules/product/src/Plugin/Commerce/Condition/OrderItemProduct.php          | 10 +----
 modules/product/src/Plugin/Commerce/Condition/OrderProduct.php              |  2 +-
 modules/product/src/Plugin/Commerce/Condition/ProductTrait.php              |  9 ++--
 .../src/Plugin/Field/FieldWidget/ProductVariationAttributesWidget.php       |  5 ++-
 modules/product/src/Plugin/Field/FieldWidget/ProductVariationWidgetBase.php | 55 +++++++----------------
 modules/product/src/ProductListBuilder.php                                  | 12 +++--
 modules/product/src/ProductTypeListBuilder.php                              | 33 +++-----------
 modules/product/src/ProductVariationAttributeMapper.php                     | 13 ++----
 modules/product/src/ProductVariationFieldRenderer.php                       |  9 +++-
 modules/product/src/ProductVariationListBuilder.php                         | 18 ++++++--
 .../tests/modules/commerce_product_test/commerce_product_test.module        |  6 +--
 .../tests/src/FunctionalJavascript/ProductLayoutBuilderIntegrationTest.php  |  4 +-
 modules/product/tests/src/Kernel/ProductVariationStorageTest.php            | 28 ++++++------
 modules/promotion/src/CouponListBuilder.php                                 | 45 ++++++-------------
 modules/promotion/src/EventSubscriber/OrderEventSubscriber.php              | 24 ++--------
 modules/promotion/src/Plugin/views/area/CouponRedemption.php                | 45 +++++--------------
 modules/promotion/src/PromotionListBuilder.php                              | 46 +++++++-------------
 modules/promotion/tests/src/Kernel/CouponStorageTest.php                    | 16 +++----
 modules/promotion/tests/src/Kernel/FilterPromotionsEventTest.php            | 14 ++----
 modules/promotion/tests/src/Kernel/PromotionStorageTest.php                 | 30 ++++++-------
 modules/promotion/tests/src/Kernel/UsageTest.php                            | 39 ++++++-----------
 modules/store/src/Plugin/Field/FieldFormatter/StoreDateTimeFormatter.php    | 61 ++++++--------------------
 modules/store/src/StoreListBuilder.php                                      | 13 ++++--
 modules/tax/src/Plugin/Commerce/TaxType/EuropeanUnionVat.php                |  7 +++
 modules/tax/src/TaxTypeListBuilder.php                                      | 27 ++----------
 phpstan-baseline.neon                                                       |  2 +-
 phpstan.neon                                                                |  9 ++++
 src/EventSubscriber/RouteSubscriber.php                                     | 69 +++++++++++++++++++++++++++++
 src/Hook/CommerceHooks.php                                                  | 13 +++---
 tests/src/FunctionalJavascript/PluginSelectTest.php                         | 27 ++++--------
 93 files changed, 996 insertions(+), 1153 deletions(-)
 delete mode 100644 drupalci.yml
 create mode 100644 src/EventSubscriber/RouteSubscriber.php

As you can see there are changes in 3.3.8 that are not in 3.x.

jsacksick’s picture

It's all there: https://git.drupalcode.org/project/commerce/-/commits/3.x?ref_type=HEADS

It seems you're tracking the wrong remote:

git log
commit f25c6badab74e90fa0c206275f39714a8eacc94f (HEAD -> 3.x, commerce-2871483/3.x)

See commerce-2871483/3.x?

damienmckenna’s picture

Status: Active » Closed (works as designed)

Sorry about that, you were correct - I didn't realize that my local was using an issue fork as the default remote.

Nothing to see here, please disperse =)

Now that this issue is closed, review the contribution record.

As a contributor, attribute any organization that helped you, or if you volunteered your own time.

Maintainers, credit people who helped resolve this issue.