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

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

On Mon, Apr 8, 2013 at 1:06 PM, Koichi Suzuki <koi...@gm...>wrote:

> Thanks Michael for a good advice.   Now I recovered our master branch to
> the status "before" 9.2.3 merge.   The merge work itself is now in 923merge
> branch, which will be used to merge with 9.2.3, as well as 9.2.4, after
> REL1_1_STABLE is created.
>
>
I think we should discard this branch (unfortunately). Otherwise we may
loose the commits we do to the master while cutting 1.1.


> Github was recovered as well (in fact, it was so noce that 9.2.3 merge has
> not been pushed to github yet).
>
> If any local branch pulled 9.2.3 merge work, please reset them with git
> reset --hard to make your local master branch consistent.
>
> I will write how to recover them to our Wiki site.
>
> Warmest Regards;
> ----------
> Koichi Suzuki
>
>
> 2013/4/5 Michael Paquier <mic...@gm...>
>
>>
>>
>>
>> On Fri, Apr 5, 2013 at 2:26 PM, Pavan Deolasee <pav...@gm...>wrote:
>>
>>>
>>>
>>>
>>> On Thu, Apr 4, 2013 at 7:13 PM, Michael Paquier <
>>> mic...@gm...> wrote:
>>>
>>>> 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.
>>>>
>>>
>>> I am sure you mean REL9_2_STABLE because thats the branch we are
>>> interested in.
>>>
>> Oh OK I missed the point. What is aimed here is the stable branch for
>> 1.1. In this case yes, it is REL9_2_STABLE.
>> I thought about merging XC-master with future PG-9.3 stable.
>>
>>
>>>
>>>
>>>> .
>>>>
>>>> Resolving it is possible of course, simply delete the existing master
>>>> branch and recreate it down to the commit before the merge.
>>>>
>>>
>>> That's not a clean way and I am not sure how it would impact the users
>>> who are already tracking the current master branch. Somebody need to study
>>> and experiment carefully before doing more damage. One way I have seen by
>>> reading docs is to use "git revert -m 1 <merge commit id>". This indeed
>>> would revert the merge commit, but unfortunately will keep the history
>>> around. Also, this would cause problems when next time we try to merge the
>>> REL9_2_STABLE branch to the corresponding XC stable branch.
>>>
>> I still vote for cleaning up history and rebasing the master branch. I
>> recall that you did it once in the past when master was synced with PG-8.4
>> stable.
>> --
>> Michael
>>
>>
>> ------------------------------------------------------------------------------
>> 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
>>
>>
>
>
> ------------------------------------------------------------------------------
> 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-core mailing list
> Pos...@li...
> https://lists.sourceforge.net/lists/listinfo/postgres-xc-core
>
>


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