[Git-dpm-user] Need help with non-upstream commit in branch

[Louis Bouchard]

Hello,

I am kind of stucked in a particular situation. I  have made a change to the
branch that I maintain with git-dpm that is not in ./debian and is also not part
of the upstream tarball.

In short, it is a change to the .travis.yml file that controls the travis-ci
builds. Now when I try to cherry-pick a patch I get :

git-dpm: ERROR: debian branch contains non-debian changes:
.travis.yml.

It looks like the debian/.git-dpm file now has the wrong commit. Is there a
'safe' way to tell git-dpm that the upstream HEAD commit has changed ?

TIA,

Kind regards,

...Louis

-- 
Louis Bouchard
Software engineer, Cloud & Sustaining eng.
Canonical Ltd
Ubuntu support: http://canonical.com/support
GPG : 429D 7A3B DD05 B6F8 AF63  B9C4 8B3D 867C 823E 7A61