> On 9 Feb 2026, at 15:32, Dianjin Wang <[email protected]> wrote:
>
> Whether Cloudberry 3.x or 4.x is eventually based on PG14 or PG16 is
> somewhat orthogonal to this discussion. The key is to keep the
> upstream/downstream relationship clear: main should always be the base
> branch for the current kernel line, and REL_x_STABLE should stay
> downstream.
Dianjin, can you please explain by example? Let's take one corruption fix of
next Postgres minors.
Here's a commit in master branch:
https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=789d65364cdecd81e4bf822eec468ea3d34d28af
Here's a version of this commit for 16 branch:
https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=6351669130782ed01eed3aeefded171789d0bc35
And here's a commit for PG 14:
https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=81416e1016ddd31a4ad0847957e44ac91495b0dc
These are 3 different commits (and there are 3 more siblings) aiming at fixing
same bug, but adjusted to test infrastructure and compatibility requirements of
different Postgres branches. Which one should we cherry-pick? And where?
Best regards, Andrey Borodin.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
