Ciao @inugent,

looks like some recent change of yours introduced a "using namespace std" in an header file. This is agains the CMS code rules and reported as an error in

https://cmssdt.cern.ch/SDT/html//rc//slc5_amd64_gcc481/www/thu/7.0-thu-02/CMSSW_7_0_X_2013-08-29-0200//codeRules/logs/GeneratorInterface/ExternalDecays/log.html

can you please clean this up? Thanks.

@nclopezo

Hi,

What is the git syntax for diff? From the rosetta stone I assume it is straight forward,
but no:

git diff CMSSW_6_0_0_pre7 CMSSW_6_0_0_pre8
fatal: ambiguous argument 'CMSSW_6_0_0_pre7': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git [...] -- [...]'

and

git diff CMSSW_6_0_0_pre7 CMSSW_6_0_0_pre8 -- HLTrigger/Configuration
fatal: bad revision 'CMSSW_6_0_0_pre7'

Hi,

when I submit a Pull request in CMSSW_6_2_X and all works fine : accepted... What is the policy for transferring these modifications also to newer versions (7_0_X...) Is it automatic ? Or must I Pull request for each new branch available ? When does 7_0 inherit/merge from 6_2 ? What is the inheritance policy ? Thanks.

How does one search for code strings throughout CMSSW in the git environment ?

Thanks.

Dave

We need to migrate CVS UserCode/ForwardCaloUpgrade to GitHub
This repository is a collection of Standalone and CMSSW SImulation tools for Phase 2 upgrade. We have many developers of these tools and the list will be growing in the future. Some of the tools will become part of CMSSW.

Do we need to create our own "Organization"? Or do we need to be a part of official CMS organization? We appreciate any suggestions on best way to proceed.

@vadler can you please follow up about the warnings in:

QCDAnalysis/ChargedHadronSpectra
MuonAnalysis/MuonAssociators

e.g.:

/build/cmsbuild/jenkins-workarea/workspace/BUILDIB/201/w/tmp/BUILDROOT/c1c78c99f5e5cd8a62de232e45433331/opt/cmssw/slc5_amd64_gcc472/cms/cmssw/CMSSW_7_0_X_2013-08-16-0200/src/MuonAnalysis/MuonAssociators/plugins/MuonMCClassifier.cc:356:2: warning: #warning "This file has been modified just to get it to compile without any regard as to whether it still functions as intended" [-Wcpp]

Hello

I migrated the code under UserCode/SUSYMCANDXPAG to GIT

(see https://hypernews.cern.ch/HyperNews/CMS/get/susy-interpretations/57.html )

This code is generically used by the SUSY PAG (for plots, signal MC production, and in general to produce the final results. The packages have been added under a dedicated organization. Potentially, the full PAG should be added to the organization.
I saw in the FAQ that you would like to discuss this, so I wrote you to notify this issue.

I would like to inform also my co-subconvener (Shahram Rahatlou) and the SUSY conveners but I cannot add people in cc here

Maurizio

I am working inside CMSSW_6_2_0 release area. I want to check out a certain package:
https://github.com/xxx/usercode/blob/master/yyy/zzz/
What would the command for this be?
Thanks, Suvadeep

Thanks for the tutorial!
While going through it, I found one line, which didn't work. After googling a bit, I found out, that it misses the user name of the repository where the branch comes from. That is, you have to change the line

git push my-cmssw tutorial-unmergeable

to

git push my-cmssw ktf/tutorial-unmergeable

Cheers,
Gregor

Hi,

While toying with the head of CMSSW_5_3_X, I noticed that the .gitignore in the root directory is not there anymore (and git status shows all .pyc files etc). Looking from the history it seems that the file was removed in commit d19ddbe (part of pull request #679). The file appears to exist in all other branches. Should it be restored to the CMSSW_5_3_X branch?

Ciao,
sorry for the very basic question.
I have pushed a development into my repository with:
git push my-cmssw my-new-feature
Now, how do I share it with a colleague? Or better, what should the colleague do to checkout my development and be able to test it?
Thanks,
Giuseppe

Our team in Brussels (about 15 members) has currently a common repository on cvs, UserCode/TopBrussels/, and we would like to migrate this to GIT. In the usercode migration instructions (http://cms-sw.github.io/cmssw/usercode-faq.html), it is mentioned that an 'organization' is more useful for a repository for larger groups (> 5 people). Do you think such an organization for our team can be created, or do you still recommend to move it to a personal repository (since we are not representing a POG/PAG, only an institute team)? For instance, it is not clear to me if code of such an 'official' CMS organization would become part of CMSSW, or if it stays outside of CMSSW like was the case on cvs.

Best regards,

Gerrit Van Onsem

Hello,
I have migrated my usercode (inugent). Could you please make it read only. Thanks you,
Ian

Ciao @rovere, @deguio

Looks like we are leaking some stuff from:

https://cmssdt.cern.ch/SDT/lxr/source/DQMServices/ClientConfig/plugins/DQMGenericClient.cc#475

Could you have a look into it and confirm this is actually the case and eventually fix it?

The cvs-based version of addpkg supports a -f option to read a list of packages to be added from a file.

Can the same functionality be added to git cms-addpkg ?

Hello,

/UserCode/Minnesota has been completely migrated from CVS (http://cmssw.cvs.cern.ch/cgi-bin/cmssw.cgi/UserCode/Minnesota/) to github (https://github.com/UMN-CMS). Please make the CVS repo read-only.

Thank you!

Dear Patrick,

could you please delete deprecated releases from https://cmssdt.cern.ch/lxr/?

Hello,

As far as I know nobody has made any change on any file under RecoMET/ from CMSSW_7_0_0_pre0 to CMSSW_7_0_0_pre1.

However, "git diff" shows many changes between CMSSW_7_0_0_pre0 and CMSSW_7_0_0_pre1.

Most of the changes seem to be in CVS $Id:$ tags. Many of those tags moved backward by one revision while the rest of the files remained the same.

To show an example, I will copy the results of "git diff" and "CVS rdiff" for RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc below

$ git diff CMSSW_7_0_0_pre0..CMSSW_7_0_0_pre1 -- RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc
diff --git a/RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc b/RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc
index 8f43a4a..b1c358c 100644
--- a/RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc
+++ b/RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc
@@ -13,7 +13,7 @@ Implementation:
 //
 // Original Author:  Frank Golf
 //         Created:  Sun Mar 15 11:33:20 CDT 2009
-// $Id: MuonTCMETValueMapProducer.cc,v 1.10 2012/01/28 16:01:24 eulisse Exp $
+// $Id: MuonTCMETValueMapProducer.cc,v 1.9 2011/02/21 10:09:21 benhoob Exp $
 //
 //

So the CVS $Id:$ tag changed backward from 1.10 to 1.9. The other part of the file didn't change. The both files are the same as 1.10 in CVS.

In CVS, 1.9 and 1.10 have actually different content.

$ cvs rdiff -r 1.9 -r 1.10 RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc
Index: CMSSW/RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc
diff -c CMSSW/RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc:1.9 CMSSW/RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc:1.10
*** CMSSW/RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc:1.9 Mon Feb 21 11:09:21 2011
--- CMSSW/RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc Sat Jan 28 17:01:24 2012
***************
*** 13,19 ****
  //
  // Original Author:  Frank Golf
  //         Created:  Sun Mar 15 11:33:20 CDT 2009
! // $Id: MuonTCMETValueMapProducer.cc,v 1.9 2011/02/21 10:09:21 benhoob Exp $
  //
  //

--- 13,19 ----
  //
  // Original Author:  Frank Golf
  //         Created:  Sun Mar 15 11:33:20 CDT 2009
! // $Id: MuonTCMETValueMapProducer.cc,v 1.10 2012/01/28 16:01:24 eulisse Exp $
  //
  //

***************
*** 142,149 ****

      //get the Bfield
      edm::ESHandle<MagneticField> theMagField;
-     bool haveBfield = true;
-     if( !theMagField.isValid() ) haveBfield = false;
      iSetup.get<IdealMagneticFieldRecord>().get(theMagField);
      bField = theMagField.product();

--- 142,147 ----
-----------------------------

Many files under RecoMET have similar changes.

$ git diff CMSSW_7_0_0_pre0..CMSSW_7_0_0_pre1 --stat -- RecoMET
 RecoMET/Configuration/python/RecoMET_Cosmics_cff.py            | 2 +-
 RecoMET/Configuration/python/RecoMET_EventContent_cff.py       | 2 +-
 RecoMET/Configuration/python/RecoMET_cff.py                    | 2 +-
 RecoMET/METAlgorithms/interface/CaloSpecificAlgo.h             | 2 +-
 RecoMET/METAlgorithms/interface/GenSpecificAlgo.h              | 2 +-
 RecoMET/METAlgorithms/interface/METAlgo.h                      | 2 +-
 RecoMET/METAlgorithms/interface/PFClusterSpecificAlgo.h        | 2 +-
 RecoMET/METAlgorithms/interface/PFSpecificAlgo.h               | 2 +-
 RecoMET/METAlgorithms/interface/SignAlgoResolutions.h          | 2 +-
 RecoMET/METAlgorithms/interface/SignCaloSpecificAlgo.h         | 2 +-
 RecoMET/METAlgorithms/interface/significanceAlgo.h             | 7 ++-----
 RecoMET/METAlgorithms/src/CaloSpecificAlgo.cc                  | 2 +-
 RecoMET/METAlgorithms/src/GenSpecificAlgo.cc                   | 2 +-
 RecoMET/METAlgorithms/src/METAlgo.cc                           | 2 +-
 RecoMET/METAlgorithms/src/PFClusterSpecificAlgo.cc             | 2 +-
 RecoMET/METAlgorithms/src/PFSpecificAlgo.cc                    | 2 +-
 RecoMET/METAlgorithms/src/SignAlgoResolutions.cc               | 2 +-
 RecoMET/METAlgorithms/src/SignCaloSpecificAlgo.cc              | 2 +-
 RecoMET/METAlgorithms/src/significanceAlgo.cc                  | 2 +-
 RecoMET/METFilters/plugins/EcalDeadCellBoundaryEnergyFilter.cc | 2 +-
 RecoMET/METFilters/plugins/HcalLaserEventFilter.cc             | 2 +-
 RecoMET/METProducers/interface/METProducer.h                   | 2 +-
 RecoMET/METProducers/interface/MinMETProducerT.h               | 4 ++--
 RecoMET/METProducers/python/pfChargedMET_cfi.py                | 2 +-
 RecoMET/METProducers/src/METProducer.cc                        | 2 +-
 RecoMET/METProducers/src/MuonMETValueMapProducer.cc            | 2 +-
 RecoMET/METProducers/src/MuonTCMETValueMapProducer.cc          | 2 +-
 27 files changed, 29 insertions(+), 32 deletions(-)

I am wondering if these changes are known and under control or if these need to be further investigated.

Tai

I forked the CMSSW repo a while ago on github and worked with it. Now that there are quite a number of changes done in the main repo, how do I update my fork to have the latest version of CMSSW ?

From Brian Pollack

The Higgs->ZGamma group would like to request a new version of CMSSW_5_3_X with pythia8.175 as the default pythia8 version. We are updating our analysis with new kinematic discriminators, and require the use of p8.175 or higher in order to properly model our signal. I have produced a private sample by changing the appropriate scram tools, but I've been told by Higgs Gen that the only way to mass produce these signals (multiple masses, higgs productions methods) is to request a new CMSSW version.

Our previous signals were generated in CMSSW_5_3_2_patch4, and we would like a release as similar to this as possible with pythia8.175.

please bring it up in ORP.

I'm trying to learn how to use git.

I followed the instructions to migrate my UserCode to github.
Then I created a new directory on lxplus, with a fresh cmsrel.
Then I check out my UserCode from github. No problems.

As a test, I created a new file called README, then did:
git add README
git commit -m'a comment'

When I try:
git push origin master

it pops up a password dialog box. Neither my github nor my NICE passwords seem to work. What password is it looking for? I thought the ssh key setup was supposed to avoid entering a password at all?

I work very little with CMSSW itself but extensively with UserCode. (Most of my UserCode work is not in my personal UserCode but in a PAG-owned UserCode; for now I am trying to learn by doing tests in my personal UserCode.)

thanks

Hi,

For the new CMS Conditions DB infrastructure we will need SQLAlchemy in CMSSW. There is already a .spec file in CMSDIST for 0.7.0 (was added for the CMS Conditions Web Services -- thanks!), but now we will need it in the official release, starting 7_0_0.

It would be nice to take the chance to upgrade to the latest release, 0.8.2, if possible. We do not really require it for the moment, but since later on will be harder to upgrade it as more projects may depend on it, I think it makes sense to start with the highest possible. Otherwise, if it is a problem, we can keep 0.7.

Thank you,
Miguel

Hi,
we migrated UserCode/DTDPGAnalysis to github. In order to prevent people from committing changes in the old CVS version, can you please freeze it?

Thanks

Mario Pelliccioni

Hi,

CVS UserCode/ForwardCaloUpgrade has been migrated to https://github.com/cms-fcal-upgrade/ForwardCaloUpgrade

Please, set CVS UserCode/ForwardCaloUpgrade if it has not been done already. Thank you!

Sasha

Hello,

I follow the instructions step-by-step in CMSSW_6_2_0_pre7/src release and get such errors after executing following commands:

git init usercode
==> error:
error: Malformed value for push.default: simple
error: Must be one of nothing, matching, tracking or current.
fatal: bad config file line 3 in /afs/cern.ch/user/k/kkaadze/.gitconfig

Obviously nothing works after that.
I checked and nothing is setup by executing

setenv MY_GITHUB_USER git config --get user.github
(instead of MY_GITHUB_USER=git config --get user.github as suggested, since I am using tcsh).

Could you suggest what I am doing wrong?

Thanks,
Keti

Hi,
I am trying to move my usercode from cvs to github.
I am having problems with the line

MY_GITHUB_USER=git config --get user.github

Whenever I try to do this, the variable MY_GITHUB_USER is blank (although I do setenv MY_GITHUB_USER git config --get SarahEno.github)

I have tried SarahEno.github, user.github, eno.github, etc but it is always blank. I am using CMSSW_5_3_11

when I did
setenv MYUSERCODE SarahEno
cvs2git --blobfile=git-blob.dat --dumpfile=git-dump.dat
/afs/cern.ch/project/cvs/reps/CMSSW/UserCode/$MYUSERCODE
--symbol-transform="(.*)/:\1-"
--use-external-blob-generator
--fallback-encoding "UTF8"
--username $USER

that seemed to work fine (at least it generated some on screen spew)

In the tutorial "Proposing changes to CMSSW", the package Tutorial/Test is referenced in an example of the "git cms-addpkg" command. This package used to exist in the official repository, but it appears to have been deleted. Since the package does not exist, the cms-addpkg command returns an error. Either the example command should be changed, or the package should be re-added to the repository.

@civanch @mdhildreth @giamman can you please follow up about the warnings in:

SimTracker/TrackHistory

Thanks. Assigning to @civanch just for the record. Tell me if someone else is better indicated for this.

Translate the example on:

https://twiki.cern.ch/twiki/bin/viewauth/CMS/FCALSimSLHCFastSim

to provide a recipe for analysis case.

Hi,

I have a few questions on Git itself. I have just migrated my UserCode areas to GitHub and trying to learn how to use Git to arrange development of my package by several collaborators.
I have already read fair amount of Git tutorials and the Git book, however some simple actions are not yet clear to me. Could you help me with these questions?

(1) How do I check the state of my master branch in the local repo vs the state of the same branch on GitHub? I would just like to find the status, which I could do in the past with CVS simply as "cvs -n update", and it would tell me U, M, C, etc.

The simplest way I know goes as
git status # to make sure working area is in sync with local repo
git fetch origin
git diff --stat master origin/master
(this still does not seem to tell me if there are conflicts)
git merge --no-commit origin/master
git status # To see how the merge went and if there are conflicts
git merge --abort # undo the attempted merge and unstage.

This seems like a rather complex procedure, so I wonder if I am missing something.

(2) How do I update my local repository given that I do not expect any conflicts?
In the past I did it with "cvs update". Now, it appears to require three commands:
git status # to make sure working area is in sync with local repo
git fetch origin
git merge origin/master

Am I right about it?

(3) Is there a way to update in the local repository only a single file? I could do it in the past with "cvs update my.file", but I do not know how to do it in Git. (Is it even conceptually possible?)

Thank you,
Ilya

I'm running the following workflows:

• 4.62 (2000 evt)
• 4.64 (2000 evt)
• 25.0 (100 evt)

in CMSSW_7_0_X_2013-08-27-1700 (which is the same as CMSSW_7_0_0_pre3) in both:

• slc5_amd64_gcc481
• slc5_amd64_gcc472

Root files should become available in:

https://cmssdt.cern.ch/SDT/jenkins-artifacts/technical-validation/4/

and

https://cmssdt.cern.ch/SDT/jenkins-artifacts/technical-validation/5/

when done. This is just a ticket to keep track of my progress on it.

@fabiocos @franzoni @vlimant

Hi,

I deleted a file in my CVS usercode area, but something went wrong, so it wasn't deleted completely.
That file is this one:
http://cmssw.cvs.cern.ch/cgi-bin/cmssw.cgi/UserCode/Miheejo/Jpsiv2/number.py?view=log
This stoppes the cvs2git migration process. Do you know how can I overcome this problem?

Thanks a lot in advance,
Mihee

Hi,

I have a question how to most effectively organise the collection of several "package" tags, given that in GIT package tags in the cvs language do not exist as always the full repository is tagged.

In the CVS language, say I have a few new tags of some packages which I want to test together. So I make a release area, and then need to pull in each updated package from someone else's GitHub repository. How does that work if the tags are repository wide? How do I ensure I get from each GiutHub repository only the single/few package I really want?

Related question: in the CVS world it was possible to have a single package tag in several release series (eg, the same HLTrigger/Configuration tag in both 53X and 61X). How does GIT support this, given that tags are not per package? Would I need to develop in one branch and then copy and commit for the other branches, given that "tags" are repository wide?

Hi,

I'm migrating a shared UserCode directory. A long time ago we had some way-too-large files in the CVS repository. They have long since been deleted, but of course they persist in the CVS Attic. The final 'push' command in the UserCode migration recipe failed because of these large (>100 MB) files. It seems that the failure is in such a way that the whole operation fails, not just the push of those few files.

Since these files are already removed to the Attic, I'm not sure what else I can do. I tried to look for an option to exclude the attic from the migration (this would be fine) but if it exists then I cannot find it.

The other idea I had was to try to edit git-blob.dat and git-dump.dat by hand to remove these files, but I don't think I have the expertise to do this in a way that won't break things.

thanks.
josh

Dear experts,

I am trying to migrate my CVS UserCode repository go github. I followed the instructions on the support page http://cms-sw.github.io/cmssw/usercode-faq.html.

This step works fine:

MYUSERCODE=Knuenz
cvs2git --blobfile=git-blob.dat --dumpfile=git-dump.dat
/afs/cern.ch/project/cvs/reps/CMSSW/UserCode/$MYUSERCODE
--symbol-transform="(.*)/:\1-"
--use-external-blob-generator
--fallback-encoding "UTF8"
--username $USER

But during this step:

MY_GITHUB_USER=git config --get user.github
MY_REMOTE=[email protected]:$MY_GITHUB_USER/usercode.git

set MY_GITHUB_USER git config --get user.github # csh

setenv MY_REMOTE [email protected]:git config --get user.github/usercode.git # csh

git init usercode
cd usercode
git remote add origin $MY_REMOTE
cat ../git-blob.dat ../git-dump.dat | git fast-import
git config http.postBuffer 524288000
git push --mirror -u origin

I get this error message:
ERROR: Repository not found.
fatal: The remote end hung up unexpectedly

This also happens if I add this line (as suggested on the page):
git push origin master

I am glad for any help in this matter.

Thanks,
Valentin Knünz

Dear Git support,

I am very very new to Git (started this morning).
I went through the tutorial by G. Eulisse and the FAQ pages, but I have
some problems even checking out a single package.

I would like to check out this package
https://github.com/h2gglobe/h2gglobe/tree/master/VertexAnalysis

I tried to do that by typing:

~/work/PhysAnalysis/UPGRADE/CMSSW_6_1_2_SLHC6_patch1/src -$>git cms-addpkg h2gglobe/VertexAnalysis
No release tags specified, using default CMSSW_6_1_2_SLHC6_patch1.
You are on branch CMSSW_6_1_X_SLHC
Checking out h2gglobe/VertexAnalysis in tag CMSSW_6_1_2_SLHC6_patch1.
Cloning into '/afs/cern.ch/work/b/bonato/PhysAnalysis/UPGRADE/CMSSW_6_1_2_SLHC6_patch1/src'...
remote: Counting objects: 56, done.
remote: Compressing objects: 100% (37/37), done.
remote: Total 42 (delta 27), reused 18 (delta 5)
Unpacking objects: 100% (42/42), done.
error: Sparse checkout leaves no entry on working directory
fatal: Could not reset index file to revision 'CMSSW_6_1_2_SLHC6_patch1'.

What does this error mean ? How can I fix it ?

Many thanks,
Alessio

When a pull request is updated, presently this message is sent out:

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

It would make life much easier (at least for people like me whose memory is full with other things and won't be remembering all the PR numbers they had to sign, or signed, before :) ) if the message could include again the list of L2s who is supposed to sign again, something like:

" Pull request #592 was updated. Signatures reset, #X #Y #Z, could you please check and sign again. "

Hello,

I am trying install one of cmssw package in T2 system.
I did not have any problem in lxplus. But when I tried to install the package in local T2 system, I am having following error message(*) I could not figure it out what went wrong so far.

Could anyone give me a clue to solve this problem?

Thank you for your help,

Regards,
Taejeong

(*)
/user/tjkim/dev/CMSSW_5_3_11_patch6/src > git cms-addpkg PhysicsTools/PatAlgos
error: More than one value for the key user.name: Taejeong
error: More than one value for the key user.name: Taejeong
No release tags specified, using default CMSSW_5_3_11_patch6.
You are on branch CMSSW_5_3_X
Checking out PhysicsTools/PatAlgos in tag CMSSW_5_3_11_patch6.
Your reference git repository does not seem to exist, would you like to create it? [ y / N / ? ] yCloning into bare repository /user/tjkim/.cmsgit-cache...
error: SSL certificate problem, verify that the CA cert is OK. Details:
error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed while accessing https://github.com/cms-sw/cmssw.git/info/refs

fatal: HTTP request failed

I came here from the UserCode git FAQ. I have migrated UserCode/InvisibleHiggs to github. Please can you make the old cvs repository read-only?

Many thanks,
Jim

Subject says it all.

Thank you,
Seth

Ciao @pedro-cipriano,

you seem to have introduced a lot of printout via std::cerr / std::cout in various places of DQM/CastorMonitor (e.g. in DQM/CastorMonitor/src/CastorMonitorModule.cc). Can you please change them to use LogError / LogWarning / LogInfo?

CC: @rovere @deguio

Hi,

I am in a team with a git organisation account: gem-sw. We forked the latest cms-sw/cmssw repository to gem-sw/cmssw. Recently I added DataFormats/GEMRecHit and RecoLocalMuon/GEMRecHit to gem-sw/cmssw. I now want to add another package (Geometry/GEMGeometryBuilder) from cms-sw/cmssw to my user area, make additions and push to gem-sw/cmssw. However, upon adding the package I get this error.

[lxplus405] /afs/cern.ch/user/d/dildick/work/GEM/tempDir/CMSSW_6_2_0_pre8/src > git cms-addpkg Geometry/GEMGeometryBuilder
No release tags specified, using default CMSSW_6_2_0_pre8.
You are on branch CMSSW_6_2_X
Checking out Geometry/GEMGeometryBuilder in tag CMSSW_6_2_0_pre8.
error: Entry 'DataFormats/GEMRecHit/BuildFile.xml' not uptodate. Cannot update sparse checkout.

Do I need to be in sync with cms-sw/cmssw to use git cms-addpkg? Can anyone explain what is going on here?

Thanks,
Sven

Dear Experts,
I'm having the following problem pushing a new branch to my git repo.
If I do the following:
cmsrel CMSSW_5_3_11_patch5
cd CMSSW_5_3_11_patch5/src
cmsenv
git cms-merge-topic lenzip:cmgtools-for-VBFH2l2Q-CMSSW_5_3_11_patch5
git checkout -b cmgtools-for-VBFH2l2Q-CMSSW_5_3_11_patch5_dev
git push my-cmssw cmgtools-for-VBFH2l2Q-CMSSW_5_3_11_patch5_dev

I get:

! [rejected] cmgtools-for-VBFH2l2Q-CMSSW_5_3_11_patch5_dev -> cmgtools-for-VBFH2l2Q-CMSSW_5_3_11_patch5_dev (fetch first)
error: failed to push some refs to '[email protected]:lenzip/cmssw.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first merge the remote changes (e.g.,
hint: 'git pull') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

However I'm sure there is no more work in that branch.
Do you have any advice how to solve this problem?
Thanks
Giulio

Hi, could you please set /UserCode/cbaus to read-only. Thanks, Colin

Hi,
would it be possible to create the release branch CMSSW_5_2_X, based on the release tag CMSSW_5_2_9 ?

According to the tag collector, 5.2.9 was up to date with the 5.2.x queue.

Thanks,
.Andrea

Ciao,
if I run git cms-checkdeps -a the code changes that I got from git pull my-cmssw my-branch are overwritten, see the example below.
Is this expected? How can I avoid this behavior?
Thanks,
Giuseppe

cmsrel CMSSW_7_0_0_pre0
cd CMSSW_7_0_0_pre0/src
cmsenv
git cms-addpkg TrackingTools/AnalyticalJacobians
git cms-addpkg TrackingTools/TrajectoryParametrization
head -n 12 TrackingTools/TrajectoryParametrization/interface/GlobalTrajectoryParameters.h

ifndef TRACKER_GLOBALTRAJECTORYPARAMETERS_H

define TRACKER_GLOBALTRAJECTORYPARAMETERS_H

include "DataFormats/GeometryVector/interface/GlobalPoint.h"

include "DataFormats/GeometryVector/interface/GlobalVector.h"

include "DataFormats/TrajectoryState/interface/TrackCharge.h"

include "DataFormats/Math/interface/AlgebraicROOTObjects.h"

class MagneticField;

/** Class providing access to a set of relevant parameters of a trajectory
in the global, Cartesian frame. The basic data members used to calculate

git pull my-cmssw cacheMFinGTP
head -n 12 TrackingTools/TrajectoryParametrization/interface/GlobalTrajectoryParameters.h

ifndef TRACKER_GLOBALTRAJECTORYPARAMETERS_H

define TRACKER_GLOBALTRAJECTORYPARAMETERS_H

include "DataFormats/GeometryVector/interface/GlobalPoint.h"

include "DataFormats/GeometryVector/interface/GlobalVector.h"

include "DataFormats/TrajectoryState/interface/TrackCharge.h"

include "DataFormats/Math/interface/AlgebraicROOTObjects.h"

// Can move the second constructor to .cc, too ... or make all
// functions inline?
// class MagneticField;

include "MagneticField/Engine/interface/MagneticField.h"

git cms-checkdeps -a
head -n 12 TrackingTools/TrajectoryParametrization/interface/GlobalTrajectoryParameters.h

ifndef TRACKER_GLOBALTRAJECTORYPARAMETERS_H

define TRACKER_GLOBALTRAJECTORYPARAMETERS_H

include "DataFormats/GeometryVector/interface/GlobalPoint.h"

include "DataFormats/GeometryVector/interface/GlobalVector.h"

include "DataFormats/TrajectoryState/interface/TrackCharge.h"

include "DataFormats/Math/interface/AlgebraicROOTObjects.h"

class MagneticField;

/** Class providing access to a set of relevant parameters of a trajectory
in the global, Cartesian frame. The basic data members used to calculate