checkdeps reverts code pull?

[cerati]

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

[ktf]

A similar issue has been reported by David Dagenhart:

scram project CMSSW_7_0_0_pre0
cd CMSSW_7_0_0_pre0/src/
cmsenv
git cms-addpkg FWCore/Framework
emacs FWCore/Framework/BuildFile.xml &
(edit only that file)
git merge official-cmssw/CMSSW_7_0_X
git cms-addpkg FWCore/Utilities
% git status
# On branch my-new-feature
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       deleted:    .gitignore
#       modified:   DQMServices/Components/python/ROOTData.py
#       deleted:    FWCore/Framework/interface/ConsumesCollector.h
#       modified:   FWCore/Framework/interface/EDConsumerBase.h
#       modified:   FWCore/Framework/src/EDConsumerBase.cc
#       modified: FWCore/Framework/test/edconsumerbase_t.cppunit.cc
#       modified:   FWCore/Framework/test/stubs/TestMergeResults.cc
#       modified:   FWCore/Integration/test/run_RunMerge.sh
#       deleted: FWCore/Integration/test/testRunMergeMERGE5_cfg.py
#       deleted:    FWCore/Integration/test/testRunMergeTEST5_cfg.py
#       modified:   FWCore/ParameterSet/python/Types.py
#       modified:   FWCore/ParameterSet/python/Utilities.py
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working
directory)
#
#       modified:   FWCore/Framework/BuildFile.xml
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       FWCore/Framework/BuildFile.xml~

looking into it.

[ktf]

Also @rovere reports the same issue.

[ktf]

I think I've understood what goes wrong, I need to think more on how to fix it.

[ktf]

Ciao, I think I have a fix for it. Can you try out the bleeding edge version:

git clone https://github.com/cms-sw/cms-git-tools.git
export PATH=$PWD/cms-git-tools:$PATH
export MANPATH=$PWD/cms-git-tools:$MANPATH

and check it behaves correctly?

[ktf]

BTW, this should now be done more easily via:

git cms-merge-topic cerati:cacheMFinGTP
git cms-checkdeps -a

[cerati]

Thanks a lot it works!
Giuseppe