Skip to content

Daily "22.0 to master" sweep: 01/06/22

Johannes Elmsheuser requested to merge elmsheus/athena:update_01_06_3 into master

This is the manual sweep of MRs from the 22.0 branch to the master branch for 01/06/22 and replaces the closed MR !53864 (closed)

There had been MR conflicts in the following 4 files when using a simple git merge upstream/22.0:

MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_DigitizationTool.h
MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
MuonSpectrometer/MuonValidation/MuonPRDTest/Root/sTGCSimHitVariables.cxx
Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

I've used instead in the MR here: git merge --strategy-option theirs upstream/22.0 to avoid these 4 MR conflicts and give preference to the 22.0 branch code.

Applied git revert 1f0e044b405f90fe56d33bcb38e69a311c9b32fd + git cherry-pick 1f0e044b405f90fe56d33bcb38e69a311c9b32fd to avoid sweeping MR !53740 (merged)

Reverted also the Project/*/version.txt updates: git revert -n cad6b586914222f0cba108236c6ee3b27612648d b2a3a7070fff5f80c99406f64668f5d417aff63e 9e63a3ae6be8bf8fbba4caa9bf2d1a6b4f7acca4 739fc5e92d5a91d38f3a704c33d48ba44793a9d9 5001cb421c510f56e4c84358574234f45bed7e73, edit Projects/AthSimulation/version.txt and Projects/Athena/version.txt, git add ., git commit -m "Revert version.txt updates"

Tagging @jojungge, @tamartin, @tadej for info.

Merge request reports