From .
 * [new ref]                 HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                 refs/pull/47374/head -> cms-sw/refs/pull/47374/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../testProducerWithPsetDesc_cfi.py                | 55 +++++++++++++++++++++-
 .../interface/ParameterSetDescription.h            |  1 +
 FWCore/ParameterSet/python/Config.py               |  8 ++--
 FWCore/ParameterSet/python/Mixins.py               |  6 ++-
 FWCore/ParameterSet/python/Types.py                |  8 +++-
 FWCore/ParameterSet/src/ParameterDescription.cc    | 25 ++++++----
 .../test/test_catch_ParameterSetDescription.cc     | 30 ++++++++++++
 7 files changed, 117 insertions(+), 16 deletions(-)
Switched to branch 'from-CMSSW_15_1_X_2025-02-17-1100'