search

cms-sw / cms-git-tools

CMS Git Helpers
34 stars 26 forks source link

Minor updates to git-cms-init #99

Closed fwyzard closed 6 years ago

fwyzard commented 6 years ago
cmsbuild commented 6 years ago

A new Pull Request was created by @fwyzard (Andrea Bocci) for branch master.

@cmsbuild, @smuzaffar, @gudrutis, @mrodozov 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.

external issue cms-sw/cmsdist#4272

fwyzard commented 6 years ago

Assuming the changes look good, what is the procedure to get them in CMSSW 10.2.x and 10.3.x ? Do we have per-release tools, or they are updated globally ?

smuzaffar commented 6 years ago

@fwyzard , changes looks good. We will merge it and include it for 10.3.X IBs. As it is a common tool for all releases/archs, so once it become part of any 10.3.0 pre-release then it will be deployed on cvmfs and become default for all releases/archs.

smuzaffar commented 6 years ago

@fwyzard , looks like this broke cms-git-merge-topic .

scram -a slc6_amd64_gcc700 project CMSSW_10_3_X_2018-08-30-1100; cd CMSSW_10_3_X_2018-08-30-1100; cmsenv ;  git cms-merge-topic --ssh -u 24418

works on lxplus but if it fails if we source /cvmfs/cms-ib.cern.ch/nweek-02539/cmsset_default.sh (which set the new cms-git-tools ).

source /cvmfs/cms-ib.cern.ch/nweek-02539/cmsset_default.sh ; scram -a slc6_amd64_gcc700 project CMSSW_10_3_X_2018-08-30-1100; cd CMSSW_10_3_X_2018-08-30-1100; cmsenv ;  git cms-merge-topic --ssh -u 24418
Cloning into '/tmp/muzaffar/CMSSW_10_3_X_2018-08-30-1100/src'...
Checking connectivity: 1849311, done.
From .
 * [new ref]                            -> merge-attempt
Error: there are staged but not committed changes on your working tree, please commit or stash them.

Can you please check, this is breaking the PR testing.