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

[Bernhard R. Link]

* Louis Bouchard <louis.bouchard at canonical.com> [140901 12:47]:
> 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 :

Does "not part of the upstream tarball" means you added an additional
file?
For a 3.0 quilt package a new file (outside debian/) has to come with a
patch, so with git-dpm that file has to be added in a commit in the
(temporary) patched branch.

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


Usually the following should help:
git-dpm checkout-patched
git cherry-pick commit-id-adding-the-file

# if that gives a merge conflict because that commit also touched
# debian/:
git rm debian # unless your .orig has debian/ then it gets a little bit more complicated
git cherry-pick --continue
# endif

git-dpm update-patches --allow-changes-in-debian-branch
#(or merge-patched instead of update-patches, if you want to wait updating debian/patches)

	Bernhard R. Link
-- 
F8AC 04D5 0B9B 064B 3383  C3DA AFFC 96D1 151D FFDC