Re: [boost] [1.61.0] Master branch is closed

Subject: Re: [boost] [1.61.0] Master branch is closed
From: Vicente J. Botet Escriba (vicente.botet_at_[hidden])
Date: 2016-04-23 17:29:02

Le 23/04/2016 23:22, Vicente J. Botet Escriba a écrit :
> Le 23/04/2016 21:44, Vladimir Prus a écrit :
>> On 4/21/2016 8:17 PM, Vicente J. Botet Escriba wrote:
>>> Le 21/04/2016 08:39, Vladimir Prus a écrit :
>>>> On 4/21/2016 1:24 AM, Vicente J. Botet Escriba wrote:
>>>>> Le 20/04/2016 21:17, Vladimir Prus a écrit :
>>>>>>
>>>>>> Boosters,
>>>>>>
>>>>>> The master branch is now closed for all changes, except by 
>>>>>> permission from a release manager.
>>>>>> Per schedule, the branch will be totally frozen on Saturday.
>>>>>>
>>>>> Hi,
>>>>>
>>>>> I've come back from vacations (last Sunday) and I believed that 
>>>>> the version 1.61 was already released.
>>>> >
>>>>> I have fixed two major bugs and some doc issues that I would like 
>>>>> to merge into the master branch.
>>>>>
>>>>> Could I do the merge on Friday if the develop regressions are good?
>>>>
>>>> Vicente,
>>>>
>>>> you've listed quite a large number of changes in your email, 
>>>> including some merge commits. This
>>>> looks like too large change to merge when the master branch is 
>>>> closed. Possibly, you've copy-pasted
>>>> something from GitHub interface, and it did not came across as 
>>>> intended.
>>>>
>>>> If you believe there are truly horrible bugs that would regress 
>>>> boost.thread, could you specifically
>>>> list those bugs, along with commits fixing those bugs specifically 
>>>> - and we can cherry-pick those
>>>> changes if so warranted.
>>>>
>>>>> The commits are the following:
>>>> ...
>>>>>     viboes
>>>>> <https://github.com/boostorg/thread/commits/develop?author=viboes>
>>>>>     committed 12 minutes ago
>>>>
>>>>
>>>> In particular, the above appears to show all your commits on 
>>>> develop, not any
>>>> particular commit, so it's hard to understand what you're proposing 
>>>> to merge.
>>>>
>>>
>>> Sorry, there were some pull merge that I need to fix and a lot of 
>>> minor doc changes.
>>>
>>> BTW this commit
>>>
> I would prefer to do a global merge, but I understand it is too late.
Hr, I've forgotten that I did already a merge on master (without the 
push evidently).

Is there a way to undo a merge locally?
Otherwise I'm trying to update the whole repository again.

Vicente