[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

MR against patched package (Was: Please give a test to cron package, in experimental)



On 10/10/23 10:15, Alex wrote:
So I wonder why you don't just provide an additional branch "master-patched" against which merge requests can be opened without the risk of causing conflicts with existing patches.

This can be easily done with git-buildpackage's `pq` (patch queue) subcommand. And it could be automated on salsa.d.o with a post-receive hook.

```
$ # turn debian/patches* into a branch
$ gbp pq import
$ # force push the generated branch to the repo on salsa
$ git push -f salsa patch-queue/master:master-patched
```

MRs against master-patched will then be possible, but they will require one extra step from the maintainer (i.e. `gbp pq export`) to turn these MRs into normal standalone patch files stored in debian/patches.

Regards,

PS: `gbp pq import/export` is a much better interface to debian/patches compared to plain `quilt`.

--
Gioele Barabucci


Reply to: