Re: [Git][xorg-team/driver/xserver-xorg-video-nouveau][debian-unstable] 2 commits: Switch to format 3.0 (quilt)

[Emilio Pozuelo Monfort <pochu@debian.org>]

Hi,

On 09/02/2025 17:16, Sven Joachim (@joachim-guest) wrote:
> Sven Joachim pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-nouveau
>
>
> Commits:
> dc58e83f by Sven Joachim at 2025-02-09T16:56:37+01:00
> Switch to format 3.0 (quilt)
>
> This ensures that there are no spurious changes to upstream sources in
> the source package, as dpkg-source aborts early.  Besides, this format
> is pretty much standard in Debian these days.
>
> The downside is that any cherry-picks from upstream commits need to be
> exported as patches, but I guess we can live with that.  There has
> been only one such cherry-pick in the last six years which was already
> exported as a patch rather than applied directly.

gbp-pq can help with this. You can do something like:

$ gbp-pq import # this will create a branch and apply the quilt patches on top, 
as individual commits
$ git cherry-pick ...
$ gbp-pq export # creates quilt patches from the commits

Maybe we could agree on such a workflow for more/all X packages.

Cheers,
Emilio