revert back the 75x automerge for HLT config v4

[davidlange6]

Not sure why.. but seems the forward port of the menu from 75x has put 76x into an inconsistent state. This commit partly reverts

969c956#diff-480ea634e7991c694ba8ed359ee91256

since we are asked to allow hlt menus not to be forked, it would be good to know why it seems they have forked. Maybe the cause is simply that this 75x PR has not yet been merged

#11547

but that should not be the issue.

There are other changes in the commit above that experts should have a look through and decide if needed or not.

[cmsbuild]

A new Pull Request was created by @davidlange6 (David Lange) for CMSSW_7_6_X.

revert back the 75x automerge for HLT config v4

It involves the following packages:

HLTrigger/Configuration

@Martin-Grunewald, @perrotta, @cmsbuild, @fwyzard can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @geoff-smith, @jalimena this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.
@Degano you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

[davidlange6]

cmsbuild, please test

[perrotta]

Hi @davidlange6

We take care of dumping the HLT menus in all relevant releases, and therefore there is generally no need to forward port pull requests which contain HLT configs. In this case, the forward port (of an older menu in 75X which attempted to overwrite a newer one in 76X) in addition provoqued indoubtly some kind of mistake,

If I look at the commit
969c956#diff-480ea634e7991c694ba8ed359ee91256
I notice that the
fragment.hltEG35CaloIdVTHEFilter
was defined twice there, where in fact one of the two definitions simply overwrote the (still needed)
fragment.hltEle32WPTightHEFilter

This pull request that reverts the automerge of the HLT menus seems to have fixed everything, by now,
Could you please remind us what should we do to prevent such automatic forward port of our (HLT config) pull requests?

By the way: as soon as #11547 will get merged in 75X (and #11573 in 74X) the dumps of the HLT menus in the three releases will get back in synchro once again.

Andrea

[davidlange6]

On Oct 18, 2015, at 1:17 PM, perrotta notifications@github.com wrote:

Hi @davidlange6

We take care of dumping the HLT menus in all relevant releases, and therefore there is generally no need to forward port pull requests which contain HLT configs. In this case, the forward port (of an older menu in 75X which attempted to overwrite a newer one in 76X) in addition provoqued indoubtly some kind of mistake,

If I look at the commit
969c956#diff-480ea634e7991c694ba8ed359ee91256
I notice that the
fragment.hltEG35CaloIdVTHEFilter
was defined twice there, where in fact one of the two definitions simply overwrote the (still needed)
fragment.hltEle32WPTightHEFilter

This pull request that reverts the automerge of the HLT menus seems to have fixed everything, by now,
Could you please remind us what should we do to prevent such automatic forward port of our (HLT config) pull requests?

use the same commits when making the PRs. I guess that should be in general easy to do in this case.

David

By the way: as soon as #11547 will get merged in 75X (and #11573 in 74X) the dumps of the HLT menus in the three releases will get back in synchro once again.

Andrea

—
Reply to this email directly or view it on GitHub.