Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • athena athena
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Jira
    • Jira
  • Merge requests 149
    • Merge requests 149
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • atlasatlas
  • athenaathena
  • Merge requests
  • !21639

Update packages:TrigEgammaAnalysisTools from archive/21.0-TrigMC to...

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Joao Victor Da Fonseca Pinto requested to merge jodafons/athena:jodafons_05_Mar_TrigEgammaAnalysisTools_to_master into master Mar 05, 2019
  • Overview 13
  • Commits 1
  • Pipelines 1
  • Changes 255+

Command used to build the workspace:

setupATLAS lsetup git asetup Athena,master,latest git clone https://:@gitlab.cern.ch:8443/jodafons/athena.git cd athena git remote add upstream https://:@gitlab.cern.ch:8443/atlas/athena.git git-package-pseudomerge.py
--packages Trigger/TrigAnalysis/TrigEgammaAnalysisTools
--source archive/21.0-TrigMC
--target upstream/master
--stage 1 (and 2 after fix all conflicts)

All conflicts were solved comparing the master and TrigMC. Most part of AcceptData strategy are taken from the master branch. Used the ctest and some trigger monitoring scripts (my script) to test everything. This MR fixed the problem related in ATR-19448

See the discussion about the pseudo merge in: ATR-19005

Tagging: @fernando and @thrynova (ringer MT task) and @wsfreund

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: jodafons_05_Mar_TrigEgammaAnalysisTools_to_master