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

[Michael P. <mic...@gm...>]

OK guys you just put the XC master out-of-sync with PG master:
http://postgres-xc.git.sourceforge.net/git/gitweb.cgi?p=postgres-xc/postgres-xc;a=commit;h=52a8aea4290851e5d40c3bb4e3237ad8aeceaf68

On Thu, Apr 4, 2013 at 7:01 PM, Ashutosh Bapat <
ash...@en...> wrote:

>
>
>
> 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.
>
Correcting you here, you will have to merge master branch up to a commit
which is the intersection of master and  REL9_3_STABLE, the intersection
commit determined by:
git merge-base master REL9_3_STABLE.

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)
>
Merging code of 9.2 stable branch of PG to XC master branch will be a huge
mistake: this would make XC master out-of-sync with PG master.


>
>
>> 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.
>
I suppose that XC 1.1 will be based on PG 9.2, no?
In this case, *FIRST* create the stable branch 1.1 when you stop
development on XC master branch (normally a beta2):
git branch REL1_1_STABLE master
*Then* merge the commits of PG 9.2 stable branch to REL1_1_STABLE. Doing
this operation reversely, as I think it has is simply crazy, and you
blocked all opportunity to update the code with future PG releases.

Resolving it is possible of course, simply delete the existing master
branch and recreate it down to the commit before the merge.
Can you guys do it without breaking the repository more??? Or not?
-- 
Michael