[Postgres-xc-developers] Commit 52a8aea4290851 (Merge with 9.2.3)

[Pavan D. <pav...@gm...>]

Hello,

While I am sure you must be doing a right thing, but since it struck to me,
I thought I should raise it here. I saw a commit message which has a
message body "Merge branch 'REL_9_2_3' into master". Its kind of a red flag
to me. I hope we are *not* merging any point releases of PostgreSQL in the
master branch of Postgres-XC. In the past, I have spent considerable time
in fixing similar mistakes and we should not be repeating that.

To explain this point further, we should always be merging only master
branch of PostgreSQL. Later, if we make a Postgres-XC release based on a
stable release of PostgreSQL, say 9.2, we should branch of Postgres-XC
repository at the same commit point as PostgreSQL did and do a release. Any
bug fixes on that stable release will then go into only that branch while
the main development would continue on the master branch. If we mistakenly
merge a PostgreSQL's point release such as 9.2.3, then we will have commits
in Postgres-XC master branch which will later conflict terribly with the
master branch commits of PostgreSQL, since the same bug may have been fixed
in PostgreSQL's master branch too.

Sorry, if this is all noise and you are doing the right thing. But then the
commit message should look different.

Thanks,
Pavan

-- 
Pavan Deolasee
http://www.linkedin.com/in/pavandeolasee