Hi Guido Am 22.07.2016 um 10:50 schrieb Guido Günther: > On Mon, Jun 27, 2016 at 08:41:18PM +0200, Michael Biebl wrote:
>> as discussed offline, in pkg-systemd we typically have two type of >> patches: upstream cherrry-picks and Debian specific patches. Upstream >> cherry-picks happen much more often and should ideally be applied >> directly on upstream master (to avoid merge conflicts), i.e. before the >> Debian patches. ... >> Ideally we would have two patch queue branches: one for upstream >> cherry-picks and one for Debian specific patches. > > In case of the upstream cherry-picks the branch should be based on the > upstream branch and not the Debian branch then? > > I'm basically fine with having multiple branches combined before writing > the patch queue. We "just" need to figure out the right UI: > > * how to tell pq which branches it should care about and in what > order (a simple ordered list of refs with a common merge-base)? > We could use the topics as branch names. > > * Do we still want to produce the linear view we currently have before > exporting so the user sees the patch queue as is or do we rather want > s.th. like "I have these 5 branches please serialize this into a > patch queue". I'd opt for the later, we need to handle conflicts then > as well though. We could reuse the ordered list from above. We started using Gbp-Topic a while ago to annotate the Debian specific patches. Upstream cherry-picks do not get a topic. So Felipe had an idea to write a small helper, which automates the process of cherry-picking an upstream commit [1]. This covers our use case nicely. So I guess from my POV we don't need the multiple patch-queue branch anymore. Maybe Felipe's helper could be generalized and added to gbp pq, like gbp pq cherry-pick <topic> Regards, Michael [1] https://anonscm.debian.org/cgit/pkg-systemd/systemd.git/commit/?h=fsateler/gcp&id=1381f9cf52dbbe40a0fef2aa84b4ee7c5760a7e7 -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Pkg-systemd-maintainers mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-systemd-maintainers
