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

[Ashutosh B. <ash...@en...>]

On Thu, Apr 4, 2013 at 3:20 PM, Ahsan Hadi <ahs...@en...>wrote:

> Hi Pavan,
>
> Thanks for raising this. Just to make sure i understand the problem, the
> next release of postgres-xc will be 1.1. The 1.1 release will be based on
> PG 9.2,
>

and that we should merge from master branch of PostgreSQL upto the point
from where REL_9_2 is cut.
If I understand correctly, what we have done right now, is we have pulled
the code from a stable branch (thus pulling changes of 9.2.3, which are not
in master branch and may not part of 9.3 release)


> when we create the branch for 1.1 we will continue to do further
> development for the next release and merges in the master branch.
>

from PostgreSQL master branch and not any REL_ or stable branches.


>  Any future PG 9.2 point releases will be committed in the 1.1 branch
> going forward. The next major release after 1.1 will be based on PG 9.3.
>
>
Is my annotation right, Pavan?


> Thanks,
> Ahsan
>
>
>
> On Thu, Apr 4, 2013 at 2:25 PM, Pavan Deolasee <pav...@gm...>wrote:
>
>> 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
>>
>>
>> ------------------------------------------------------------------------------
>> Minimize network downtime and maximize team effectiveness.
>> Reduce network management and security costs.Learn how to hire
>> the most talented Cisco Certified professionals. Visit the
>> Employer Resources Portal
>> http://www.cisco.com/web/learning/employer_resources/index.html
>> _______________________________________________
>> Postgres-xc-developers mailing list
>> Pos...@li...
>> https://lists.sourceforge.net/lists/listinfo/postgres-xc-developers
>>
>>
>
>
> --
> Ahsan Hadi
> Snr Director Product Development
> EnterpriseDB Corporation
> The Enterprise Postgres Company
>
> Phone: +92-51-8358874
> Mobile: +92-333-5162114
>
> Website: www.enterprisedb.com
> EnterpriseDB Blog: http://blogs.enterprisedb.com/
> Follow us on Twitter: http://www.twitter.com/enterprisedb
>
> This e-mail message (and any attachment) is intended for the use of the
> individual or entity to whom it is addressed. This message contains
> information from EnterpriseDB Corporation that may be privileged,
> confidential, or exempt from disclosure under applicable law. If you are
> not the intended recipient or authorized to receive this for the intended
> recipient, any use, dissemination, distribution, retention, archiving, or
> copying of this communication is strictly prohibited. If you have received
> this e-mail in error, please notify the sender immediately by reply e-mail
> and delete this message.
>
>
> ------------------------------------------------------------------------------
> Minimize network downtime and maximize team effectiveness.
> Reduce network management and security costs.Learn how to hire
> the most talented Cisco Certified professionals. Visit the
> Employer Resources Portal
> http://www.cisco.com/web/learning/employer_resources/index.html
> _______________________________________________
> Postgres-xc-developers mailing list
> Pos...@li...
> https://lists.sourceforge.net/lists/listinfo/postgres-xc-developers
>
>


-- 
Best Wishes,
Ashutosh Bapat
EntepriseDB Corporation
The Enterprise Postgres Company