Re: [DISCUSS] Add definition to our cherry picking process

2021-12-22 Thread Michael Marshall
I am very interested in Jonathan's proposal. I think we could really benefit from a workflow that keeps branches in a (near) ready to release state and prioritizes the stability of our active branches. It would be great to hear from other community members regarding our current process, its benefi

Re: [DISCUSS] Add definition to our cherry picking process

2021-12-15 Thread Jonathan Ellis
First, it's often not an issue -- new contributors typically start with small patches that the reviewer or committer can easily rebase to the appropriate branch, and by the time they're working on more invasive fixes (we don't have any of those, right? :) they get used to how it works. But when th

Re: [DISCUSS] Add definition to our cherry picking process

2021-12-15 Thread Enrico Olivelli
Jonathan, Il Mer 15 Dic 2021, 21:11 Jonathan Ellis ha scritto: > What are the benefits of cherry picking vs committing to the oldest > relevant branch and merging forwards? We (and most of the ASF projects I am involved in) ask contributors to target the master branch for the patches. How can

Re: [DISCUSS] Add definition to our cherry picking process

2021-12-15 Thread Jonathan Ellis
What are the benefits of cherry picking vs committing to the oldest relevant branch and merging forwards? Git is designed around merge since that preserves the commit sha which allows it to be tracked across branches. And a merge based workflow avoids the problem here by design. On Wed, Dec 15,

[DISCUSS] Add definition to our cherry picking process

2021-12-15 Thread Michael Marshall
Hello Pulsar Community, As far as I can tell, we do not have a publicly defined process for cherry-picking commits to release branches [0]. As a new committer, I'd like to provide my newly gained perspective and ask that we add some guidance to our wiki. Regarding cherry picking, I see two patter