Skip to content
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

Remove CVS keywords from L1* #661

Merged
merged 1 commit into from Sep 2, 2013

Conversation

nclopezo
Copy link
Contributor

No description provided.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @nclopezo (David Mendez) for CMSSW_7_0_X.

Remove CVS keywords from L1*

It involves the following packages:

L1TriggerConfig/L1GtConfigProducers
L1TriggerConfig/GctConfigProducers
L1Trigger/GlobalTrigger
L1TriggerConfig/L1ScalesProducers
L1Trigger/RPCTechnicalTrigger
L1Trigger/L1GctAnalyzer
L1TriggerConfig/L1GeometryProducers
L1TriggerConfig/L1CSCTPConfigProducers
L1Trigger/DTSectorCollector
L1Trigger/RegionalCaloTrigger
L1TriggerConfig/DTTPGConfigProducers
L1Trigger/GlobalCaloTrigger
L1Trigger/CSCTriggerPrimitives
L1TriggerConfig/CSCTFConfigProducers
L1Trigger/DTTraco
L1TriggerConfig/GMTConfigProducers
L1Trigger/DTTriggerServerTheta
L1TriggerConfig/DTTrackFinder
L1Trigger/DTUtilities
L1Trigger/RPCTrigger
L1Trigger/DTTrigger
L1Trigger/L1ExtraFromDigis
L1TriggerConfig/RCTConfigProducers
L1TriggerOffline/L1Analyzer
L1TriggerConfig/RPCTriggerConfig
L1Trigger/CSCTrackFinder
L1Trigger/TextToDigi
L1Trigger/DTTrackFinder
L1Trigger/GlobalTriggerAnalyzer
L1Trigger/DTBti
L1Trigger/DTTriggerServerPhi
L1Trigger/GlobalMuonTrigger

@mulhearn can you please review it and eventually sign? Thanks.
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.

@@ -10,7 +10,6 @@
* \author: Vasile Mihai Ghete - HEPHY Vienna
*
* $Date$
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a few "$Date$ which should be removed as well.

@mulhearn
Copy link
Contributor

Yes, I see there are still some $Date$ tags that haven't been removed. Will David make the change?

@ktf
Copy link
Contributor

ktf commented Aug 29, 2013

I hope so, but maybe tomorrow.

@ktf
Copy link
Contributor

ktf commented Aug 29, 2013

No particular reason to wait actually. We can have a smaller request tomorrow
to handle the rest. Unless you object I would just merge it.

@mulhearn
Copy link
Contributor

OK I am attempting to merge and build it now...

@mulhearn
Copy link
Contributor

This is taking forever, at this last line, any idea what is going on?

mulhearn@lxplus0378>cmsrel CMSSW_7_0_0_pre2
mulhearn@lxplus0378>cd CMSSW_7_0_0_pre2/src/
mulhearn@lxplus0378>cmsenv
mulhearn@lxplus0378>git cms-addpkg FWCore/Version
No release tags specified, using default CMSSW_7_0_0_pre2.
You are on branch CMSSW_7_0_X
Checking out FWCore/Version in tag CMSSW_7_0_0_pre2.
Cloning into '/afs/cern.ch/work/m/mulhearn/relval/take2/CMSSW_7_0_0_pre2/src'...
remote: Counting objects: 1443, done.
remote: Compressing objects: 100% (360/360), done.
remote: Total 532 (delta 446), reused 247 (delta 169)
Receiving objects: 100% (532/532), 75.58 KiB | 0 bytes/s, done.
Resolving deltas: 100% (446/446), completed with 407 local objects.
Branch from-CMSSW_7_0_0_pre2 set up to track remote branch CMSSW_7_0_X from official-cmssw.
Switched to a new branch 'from-CMSSW_7_0_0_pre2'
HEAD is now at 631bb66 Merge pull request #252 from ianna/geometry-data-xml-description
mulhearn@lxplus0378>git checkout -b mulhearn-validation
Switched to a new branch 'mulhearn-validation'
mulhearn@lxplus0378>git cms-merge-topic nclopezo:remove-cvs-keywords-from-l1
No release tags specified, using default CMSSW_7_0_0_pre2.
You are on branch CMSSW_7_0_X
Checking out FWCore/Version in tag CMSSW_7_0_0_pre2.
From .

  • [new ref] -> merge-attempt
    remote: Counting objects: 1110, done.
    remote: Compressing objects: 100% (430/430), done.
    remote: Total 616 (delta 515), reused 284 (delta 183)
    Receiving objects: 100% (616/616), 164.21 KiB | 0 bytes/s, done.
    Resolving deltas: 100% (515/515), completed with 445 local objects.
    From https://github.com/nclopezo/cmssw
  • [new branch] remove-cvs-keywords-from-l1 -> nclopezo/remove-cvs-keywords-from-l1
    Switched to branch 'merge-attempt'

@mulhearn
Copy link
Contributor

It seems I got the entire CMSSW repo when I used cms-merge-topic. What did I do wrong?

@mulhearn
Copy link
Contributor

Sorry, new guy here: so am I supposed to have my own build of cms_sw:CMSSW_7_0_X built, and then just test these changes against it? Or is there some way to select out only the packages listed above from nclopezo:remove-cvs-keywords-from-l1 and compile against e.g. CMSSW_7_0_0_pre2?

Or am I just supposed to approve this because it only changed comments ;-)

@nclopezo
Copy link
Contributor Author

Hi @mulhearn

You can use git cms-merge-topic 661, to get the changes on this pull request and test it.

I updated my pull request deleting the $Date$ tags. I am testing that it compiles here:

https://cmssdt.cern.ch/jenkins/job/Pull-Request-Integration/ARCHITECTURE=slc5_amd64_gcc472/321/console

@nclopezo
Copy link
Contributor Author

As I see in the logs, everything compiled.

@cmsbuild
Copy link
Contributor

Pull request #661 was updated. Signatures reset, please check and sign again.

@mulhearn
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next IBs unless changes or unless it breaks tests.

@mulhearn
Copy link
Contributor

Thanks for doing the compile check on Jenkins and posting the log. If I wanted to compile a topic like this myself, e.g. for additional testing, is there a way I have access to the daily builds to compile against, or are those only available on Jenkins?

@nclopezo
Copy link
Contributor Author

Hi @mulhearn

If you wanted to test on CMSSW_7_0_X_2013-08-29-1400 for example, you can run

cmsrel CMSSW_7_0_X_2013-08-29-1400

instead of

cmsrel CMSSW_7_0_0_pre2

and then

cmsenv
git cms-merge-topic 661
etc...

@mulhearn
Copy link
Contributor

Oh! I didn't see these in "scram list CMSSW" because of different architecture... Thanks!

nclopezo added a commit that referenced this pull request Sep 2, 2013
@nclopezo nclopezo merged commit 2fdd3d8 into cms-sw:CMSSW_7_0_X Sep 2, 2013
clelange pushed a commit to clelange/cmssw that referenced this pull request Nov 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants