reshke commented on PR #1574: URL: https://github.com/apache/cloudberry/pull/1574#issuecomment-4039165866
> Hi @reshke, let me clarify my previous comment. > > My concern is about the cherry-pick strategy for the upcoming release (e.g., `2.2`). Currently, the main branch contains not only the commits cherry-picked from PostgreSQL (`14.4-14.20`), but also other development changes mixed in between. > > For easier management, I suggest we start from the point where the last `2.1` cherry-pick ended and cherry-pick all eligible commits from `main` to `REL_2_STABLE` together. This would be more convenient than: > > 1. The current PR only includes commits cherry-picked from PostgreSQL > 2. Other eligible commits on main would need to be identified and cherry-picked separately > > My suggested approach would ensure we don't miss any commits that should be included in the next release, and it's easier to track what has been backported. > > Just want to make sure, does this sound good to you? Sorry, I messed up with #1610, here is another try https://github.com/apache/cloudberry/pull/1611 I decided to make all diskquota-related commit cherry-pick and all before (https://github.com/apache/cloudberry/commit/ffe370bd646547d5e81933805b76b79bd1e52f51 and parents) in two separate PR for ease of review. Is it OK? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
