Skip to content

2024-11-15: merge of 24.0 into main

Vakhtang Tsulaia requested to merge tsulaia/athena:sweep_24.0_main_2024-11-14 into main

Plenty of conflicts this time

  1. Control/AthenaCommon/python/AppMgr.py. Triggered by !75862 (merged) (CC @jchapman). 24.0 modified a code block deleted in the main.
  2. Control/AthenaServices/CMakeLists.txt. The result of changes in !75846 (merged) 24.0 and !75461 (merged) main. Both MR-s are from @amete. Keeping the version from main
  3. Database/APR/RootStorageSvc/src/RootDatabase.cpp. The same !75846 (merged) from @amete. Two new include-s introduced in 24.0. Added them manually to the main
  4. Database/AthenaRoot/RootAuxDynIO/RootAuxDynIO/RootAuxDynDefs.h. Another one related to !75846 (merged). Here we have two conflicting definitions of the function RootAuxDynIO::endsWithAuxPostfix(). One from @amete in 24.0 and one by @mnowak in main. I kept the former for now. Please feel free to object.
  5. Database/AthenaRoot/RootAuxDynIO/src/[RNTupleAuxDynReader.cxx,RNTupleAuxDynWriter.cxx,RNTupleAuxDynWriter.h]. The last one from !75846 (merged). Mostly ignored the 24.0 changes
  6. Event/PyDumper/python/Dumpers.py. Comes from !75867 (merged) (@jchapman). Trivial conflict: one extra line in main. Kept it
  7. Tools/PyJobTransformsCore/python/[fileutil.py,full_trfarg.py,trferr.py] from !75865 (merged) (@jchapman). Changes in the code that no longer exists in the main. Ignored
  8. LArCalorimeter/LArG4/LArG4FastSimulation/src/EndcapFastSimDedicatedSD.cxx. Comes from !75838 (merged) (@jchapman). Trivial conflict. Took the 24.0 version
  9. ForwardDetectors/ZDC/ZdcAnalysis/Root/ZDCPulseAnalyzer.cxx. Comes from !75844 (merged) (@steinber). Trivial conflicts, but I had to resolve them manually anyway.
  10. InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh. Comes from !75813 (merged) (@tstreble). Resolved manually

This sweep contains the following MRs:

Edited by Vakhtang Tsulaia

Merge request reports