[git-buildpackage] Patches applied in master?

[Guido Günther]

Hi Nikolaus,
On Tue, Jan 03, 2017 at 10:27:07AM -0800, Nikolaus Rath wrote:
> On Jan 03 2017, Guido Günther <agx-wGvLLbajjwFAfugRpC6u6w at public.gmane.org> wrote:
> > Hi,
> > On Mon, Jan 02, 2017 at 09:48:17PM -0800, Nikolaus Rath wrote:
> >> Hello,
> >> 
> >> When reading up some discussions on gbp/dgit interoperability, several
> >> people alluded to the theoretical possibility of using gbp with a
> >> patches-applied master branch.
> >> 
> >> Is this officially supported? If so, how do I use it?
> >
> > I've not used it this way for some time now but nothing would prevent
> > gbp build-package, import-orig, dch, clone and pull with a pathed
> > tree. You might want to use -single-debian-patch --auto-commit with
> > dpkg-source (or debian/source/options) in this case though to not have
> > to do the sync between debian/patches and your source tree by hand
> > [1].
> 
> Ah, no. What I wanted was to still have gbp create the patches in
> debian/patches *and* have them applied in master (like git-dpm does). So
> I guess that is not possible?

While gbp pq has the basics for that: turn a patched source tree into a
patch-queue and turn a debian/patches dir into a patched tree it
currently does not help you creating a forwardable history. This is by
choice since all tools attempting this so far are not as simple to
use as --auto-commit --single-debian-patch _or_ unpatched sources and
patches in debian/patches.
E.g. requiring everybody to use the same tooling in a team or having
some metadata in debian/ are the things I wanted to avoid with gbp pq.

So yes, what you seek is not implemented. If your only issue is that you
don't want to read interdiffs you can tag the patch-queue/<debian-branch>
with every upload (e.g. with post-tag hook) and use that when
diffing. This would probably even be useful to have without having to
resort to a hook.

Cheers,
 -- Guido