Hi Guido, thanks for the fast reply.
On Fri, Nov 11, 2016 at 07:45:28AM +0100, Guido Günther wrote: > On Thu, Nov 10, 2016 at 10:23:32AM +0100, Markus Blatt wrote: > > > > I have playing around with git-buildpackage for a few days (Debian > > stable). I am using the "3.0 (quilt)" source format (switched from > > 1.0) and like to quilt patches with a patch-queue branch. I can > > sucessfully build the packge on the patch-queue. But when I use the > > debian branch with the quilt patches they seem to get applied twice. > > This fails miserably. > > > > The output of "gbp buildpackage --git-pristine-tar \ > > --git-pristine-tar-commit -uc --git-verbose \ > > --git-debian-branch=debian/sid" > > is attached. > > > > Any ideas what goes wrong or how I could prevent one application of > > the quilt packages would be highly appreciated. > > Please provide a git tree you run the above commands on and let me know > which branch you run tht on to reproduce this. > I have push the tags, debian/sid (failing build), and pristine-tar branches to https://github.com/blattms/ert-debian.git. The upstream is https://github.com/Ensembles/ert My .git/gbp.conf is [git-buildpackage] upstream-tag = release/%(version)s/final My gbp version is 0.6.22 If you need more information please ask. Thanks a lot for the help. Markus _______________________________________________ git-buildpackage mailing list [email protected] http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
