Boost logo

Boost :

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


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.
>> * hiden typo (cosmetic)
>> https://github.com/boostorg/thread/commit/640e1acb9836b2e0b74695b3b5baa527698a9b2d
>>
>> https://github.com/boostorg/thread/commit/587ad425489ebac3d68a2ba64a8c201a9aa886ab
>>
>>
>> The last one introduced two new files that are not used and I've
>> removed in
>> https://github.com/boostorg/thread/commit/2c3acef28131840bc96d57cbccc392bfbee6f898
>>
>
> I don't think that fixing a typo is a necessary patch at this point.
Ok.
>
>> * fix memory leak (BUG - robustness)
>> https://github.com/boostorg/thread/commit/c7a5122fd3333800fd33f3407f6868a79694407d
>>
>> https://github.com/boostorg/thread/commit/daae305bf77a84cb7446096ae31d61084362fe49
>>
>> https://github.com/boostorg/thread/commit/98dbc9da413d5b30cfb041338492da53f527c6e1
>>
>
> These seem safe and important, so you can cherry-pick them. For
> avoidance of doubt,
> I mean specifically using "git cherry-pick <commit>", where commit is
> one of 3 above.
I have never used this way. I would try it now.
>
>>
>> * call interrupt only if joinable. (optimization cosmetic)
>> https://github.com/boostorg/thread/commit/55a1325f303957d5637819432a40a70bfbd66e0e
>>
>
> If it is cosmetic, can it wait for next release?
Ok.
>
>>
>> * call on_desctruction on scoped_thread move assignment. (BUG -
>> showstopper for scoped_thread )
>>
>> https://github.com/boostorg/thread/commit/aab2891cdbc3c19ef492f16a7c473a4ccc488bff
>>
>
> This one is a documentation change. Is it really showstopper, or you
> meant some other commit?
>
Sorry, it was
https://github.com/boostorg/thread/commit/411798367b075a0e993010252eec81b846e011ef

I would include it if there is no objection.

Best,
Vicente


Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk