New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add 9_4_9_cand1 content on top of 9_4_X as a patch #23549
Conversation
A new Pull Request was created by @fabiocos (Fabio Cossutti) for CMSSW_9_4_X. It involves the following packages: CommonTools/ParticleFlow @perrotta, @prebello, @arunhep, @kpedro88, @fabozzi, @cmsbuild, @gpetruc, @franzoni, @cerminar, @slava77, @GurpreetSinghChahal, @pohsun, @monttj, @arizzi, @lpernie can you please review it and eventually sign? Thanks. cms-bot commands are listed here |
please test |
The tests are being triggered in jenkins. |
@smuzaffar @slava77 this is the backport of 9_4_MAOD_X into 9_4_X that avoids messing up the commit history |
Comparison job queued. |
Comparison is ready Comparison Summary:
|
+upgrade |
+1 |
+1 |
+1 |
merge after the validation of CMSSW_9_4_9_cand2, merge this PR and then add the difference between cand2 and cand1 on top |
+1 |
Pull request #23549 was updated. @simonepigazzini, @vlimant can you please check and sign again. |
The content of this PR is equivalent to #23474 , but instead of doing a simple "git checkout CMSSW_9_4_X ; git merge CMSSW_9_4_MAOD_X" it is obtained by applying on top of CMSSW_9_4_X the result of the "git diff CMSSW_9_4_X..CMSSW_9_4_MAOD_X".
The result of "git diff --name-only fc-MAODbackport..CMSSW_9_4_MAOD_X" is empty.
In this way the synchronisation of the 94X and 9_4_MAOD_X code happens without jeopardising the commit history (affected by forward ports). For the detailed history of the commits the 9_4_MAOD_X branch can be checked