For a considerable time, I believe the cherry-pick to branch-3 should be clean, it's just that we will need to explicitly remember and make this more of a routine, correct?
On Thu, Jun 8, 2023 at 8:07 AM Bryan Beaudreault <bbeaudrea...@apache.org> wrote: > Nice! So in addition to current conventions around cherry-picking to > branch-2*, we should probably almost always cherry-pick changes to branch-3 > going forward for now. > > On Thu, Jun 8, 2023 at 10:43 AM 张铎(Duo Zhang) <palomino...@gmail.com> > wrote: > > > I've already cut branch-3, which is on this commit > > > > d539917514cd87fcf67cc28648cec004e91d9d85 > > > > The next 3.x release 3.0.0-beta-1 will be released on branch-3. > > > > And on setting fix versions: > > > > 1. If a patch will be applied to both master and branch-3, you just > > need to set its fix versions to 3.0.0-beta-1(or 3.0.0-beta-2 if beta-1 > > has been released out, etc). > > 2. If a patch will only be applied to master, you need to set its fix > > versions to 4.0.0-alpha-1. > > 3. After the final 3.0.0 release is out, all patches which go into > > master need to have a 4.0.0-alpha-1 fix version. > > > > Thanks. > > >
