From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47533/head -> cms-sw/refs/pull/47533/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 DataFormats/Provenance/interface/ProductRegistry.h |  63 ++++-----
 DataFormats/Provenance/src/ProductRegistry.cc      |  58 +++------
 FWCore/Framework/interface/EventProcessor.h        |   7 +-
 FWCore/Framework/interface/GlobalSchedule.h        |   4 +-
 FWCore/Framework/interface/InputSource.h           |   1 -
 FWCore/Framework/interface/ModuleChanger.h         |   8 +-
 FWCore/Framework/interface/OutputModuleCore.h      |   4 +-
 FWCore/Framework/interface/ProducerBase.h          |   4 +-
 FWCore/Framework/interface/ProductRegistryHelper.h |   4 +-
 FWCore/Framework/interface/Schedule.h              |  10 +-
 FWCore/Framework/interface/ScheduleItems.h         |   8 +-
 .../interface/SignallingProductRegistry.h          |  60 ---------
 .../interface/SignallingProductRegistryFiller.h    | 114 ++++++++++++++++
 FWCore/Framework/interface/StreamSchedule.h        |  12 +-
 FWCore/Framework/interface/WorkerManager.h         |   4 +-
 FWCore/Framework/interface/global/EDAnalyzerBase.h |   4 +-
 FWCore/Framework/interface/global/EDFilterBase.h   |   4 +-
 FWCore/Framework/interface/global/EDProducerBase.h |   2 +-
 .../Framework/interface/limited/EDAnalyzerBase.h   |   4 +-
 FWCore/Framework/interface/limited/EDFilterBase.h  |   2 +-
 .../Framework/interface/limited/EDProducerBase.h   |   2 +-
 .../Framework/interface/maker/InputSourceFactory.h |   2 +-
 .../Framework/interface/maker/MakeModuleParams.h   |   6 +-
 FWCore/Framework/interface/maker/ModuleHolder.h    |   8 +-
 FWCore/Framework/interface/maker/WorkerParams.h    |   6 +-
 FWCore/Framework/interface/one/EDAnalyzerBase.h    |   4 +-
 FWCore/Framework/interface/one/EDFilterBase.h      |   2 +-
 FWCore/Framework/interface/one/EDProducerBase.h    |   2 +-
 .../interface/stream/EDAnalyzerAdaptorBase.h       |   4 +-
 FWCore/Framework/interface/stream/EDAnalyzerBase.h |   2 +-
 .../interface/stream/ProducingModuleAdaptorBase.h  |   4 +-
 FWCore/Framework/src/EventProcessor.cc             |   5 +-
 FWCore/Framework/src/GlobalSchedule.cc             |   2 +-
 FWCore/Framework/src/ModuleChanger.cc              |   2 +-
 FWCore/Framework/src/OutputModuleCore.cc           |   4 +-
 FWCore/Framework/src/ProducerBase.cc               |   8 +-
 FWCore/Framework/src/ProductRegistryHelper.cc      |   4 +-
 FWCore/Framework/src/Schedule.cc                   |  43 +++---
 FWCore/Framework/src/ScheduleItems.cc              |   9 +-
 ...istry.cc => SignallingProductRegistryFiller.cc} |   6 +-
 FWCore/Framework/src/StreamSchedule.cc             |  24 ++--
 FWCore/Framework/src/SubProcess.cc                 |   3 +-
 FWCore/Framework/src/WorkerMaker.cc                |   2 +-
 FWCore/Framework/src/WorkerManager.cc              |   4 +-
 FWCore/Framework/src/global/EDAnalyzerBase.cc      |   4 +-
 FWCore/Framework/src/limited/EDAnalyzerBase.cc     |   4 +-
 FWCore/Framework/src/one/EDAnalyzerBase.cc         |   4 +-
 FWCore/Framework/src/processEDAliases.cc           |  22 ++--
 FWCore/Framework/src/processEDAliases.h            |   4 +-
 .../Framework/src/stream/EDAnalyzerAdaptorBase.cc  |   3 +-
 FWCore/Framework/src/stream/EDAnalyzerBase.cc      |   4 +-
 .../src/stream/ProducingModuleAdaptorBase.cc       |   2 +-
 FWCore/Framework/test/Event_t.cpp                  |  11 +-
 .../test/edproducer_productregistry_callback.cc    |  14 +-
 .../test/event_getrefbeforeput_t.cppunit.cc        |   7 +-
 FWCore/Framework/test/eventprincipal_t.cppunit.cc  |  16 ++-
 FWCore/Framework/test/generichandle_t.cppunit.cc   |   9 +-
 FWCore/Framework/test/maker2_t.cppunit.cc          |   4 +-
 FWCore/Framework/test/productregistry.cppunit.cc   |  37 +++---
 FWCore/Framework/test/test_catch2_Factory.cc       |   4 +-
 ...test_catch2notTP_MergeableRunProductMetadata.cc | 144 +++++++++++----------
 FWCore/Sources/src/PuttableSourceBase.cc           |   6 +-
 FWCore/TestProcessor/interface/TestProcessor.h     |   2 +-
 .../TestProcessor/interface/TestSourceProcessor.h  |   2 +-
 FWCore/TestProcessor/src/TestProcessor.cc          |   7 +-
 FWCore/TestProcessor/src/TestSourceProcessor.cc    |   2 +-
 IOPool/SecondaryInput/test/SecondaryProducer.cc    |   4 +-
 67 files changed, 460 insertions(+), 391 deletions(-)
 delete mode 100644 FWCore/Framework/interface/SignallingProductRegistry.h
 create mode 100644 FWCore/Framework/interface/SignallingProductRegistryFiller.h
 rename FWCore/Framework/src/{SignallingProductRegistry.cc => SignallingProductRegistryFiller.cc} (88%)
Switched to branch 'from-CMSSW_15_1_X_2025-03-07-1100'