drumkv1 repo - failed merge

[Jaromír Mikeš]

2017-06-27 14:18 GMT+02:00 James Cowgill <jcowgill at debian.org>:

> Hi,
>
> On 27/06/17 13:12, Jaromír Mikeš wrote:
> > 2017-06-27 13:14 GMT+02:00 James Cowgill <jcowgill at debian.org
> > <mailto:jcowgill at debian.org>>:
> >
> >     Hi,
> >
> >     On 27/06/17 12:11, Jaromír Mikeš wrote:
> >     > 2017-06-27 12:06 GMT+02:00 Fabian Greffrath <fabian at greffrath.com
> <mailto:fabian at greffrath.com>
> >     > <mailto:fabian at greffrath.com <mailto:fabian at greffrath.com>>>:
> >     >
> >     >     Jaromír Mikeš wrote:
> >     >
> >     >
> >     > Hi Fabian,
> >     >
> >     >
> >     >     > Can someone advise me how to fix it pls?
> >     >
> >     >     Do you have any patches applied? If yes, unapply them before
> >     >     attempting to
> >     >     merge the new upstream release.
> >     >
> >     >     If this doesn't help, try calling "git checkout -- " on the
> files git
> >     >     complains about.
> >     >
> >     >
> >     > Tried this now but it didn't help :(
> >
> >     This might work:
> >
> >     Ensure everything is stashed / committed
> >     Delete all the files in your working directory
> >     Run:
> >     $ git checkout upstream -- .
> >     $ git checkout -- debian/ .gitignore
> >
> >     Commit the result
> >
> >
> > Still not work :(
>
> What happens when you run the above? It seems to work OK for me
> (dpkg-buildpackage -S works).


$ git checkout upstream --
Switched to branch 'upstream'
Your branch is up-to-date with 'origin/upstream'.
$ git checkout -- debian/ .gitignore
error: pathspec 'debian/' did not match any file(s) known to git.
error: pathspec '.gitignore' did not match any file(s) known to git.
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean

I am building with pbuilder:
gbp buildpackage --git-pbuilder  --git-dist=sid --git-pristine-tar

mira
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20170627/d9d631d1/attachment-0001.html>