On Fri, Jul 31, 2015 at 03:21:59PM +0100, Ian Jackson wrote: > Guido Günther writes: > > Having patches applied with 3.0(quilt) calls out for sync problems > > between your git tree and debian/patches/. This can be mitigated with > > --single-debian-patch --auto-commit but that's not what most people mean > > when talking about 3.0(quilt) - and it kind of defeats it's purpose. > > I think the problems you are describing arise when the user does _both_ > (a) manipulate the patches in debina/patches/ (with maybe quilt) _and_ > (b) manipulate the upstream code in git.
Yeah, but this happens easily with a patched tree and people having different work flows. > > Does git-buildpackage have a way to take a patches-applied git tree > and turn it into a patches-unapplied form ? If so then it might be Yes, "gbp pq" does this. > sensible for gbp users who want to publish a directly-useable git > branch to treat the dgit branch as an export format: ie, to explicitly > convert to it, and to convert _from_ it where necessary. This could be done with a post-tag hook in gbp for the time beeing and maybe move into the core if it proves useful. That said, I have plans to make the "patch queue branch" pushable as well - in that case we could use that directly. Cheers, -- Guido -- To UNSUBSCRIBE, email to debian-devel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20150801124823.ga21...@bogon.m.sigxcpu.org
