Is merging to the release branch allowed again?
Since I hate holding back merging to the release branch to the last minute before the next release I would like to start doing this asap. Any idea when this might be allowed again? Regards Hartmut --------------- http://boost-spirit.com
On Nov 30, 2010, at 6:44 AM, Hartmut Kaiser wrote:
Since I hate holding back merging to the release branch to the last minute before the next release I would like to start doing this asap. Any idea when this might be allowed again?
It is my belief that once the release is made, the release branch is open for changes again. In fact, I merged files to the release branch last night. If this is incorrect, then I'm sure one of the release managers will step up and slap me silly^H^H^H^ gently correct me. -- Marshall
On Tue, Nov 30, 2010 at 9:58 AM, Marshall Clow <mclow.lists@gmail.com>wrote:
On Nov 30, 2010, at 6:44 AM, Hartmut Kaiser wrote:
Since I hate holding back merging to the release branch to the last minute before the next release I would like to start doing this asap. Any idea when this might be allowed again?
It is my belief that once the release is made, the release branch is open for changes again. In fact, I merged files to the release branch last night.
If this is incorrect, then I'm sure one of the release managers will step up and slap me silly^H^H^H^ gently correct me.
Yep, OK to merge to release. --Beman
On 11/30/2010 2:23 PM, Beman Dawes wrote:
On Tue, Nov 30, 2010 at 9:58 AM, Marshall Clow <mclow.lists@gmail.com>wrote:
On Nov 30, 2010, at 6:44 AM, Hartmut Kaiser wrote:
Since I hate holding back merging to the release branch to the last minute before the next release I would like to start doing this asap. Any idea when this might be allowed again?
It is my belief that once the release is made, the release branch is open for changes again. In fact, I merged files to the release branch last night.
If this is incorrect, then I'm sure one of the release managers will step up and slap me silly^H^H^H^ gently correct me.
Yep, OK to merge to release.
I guess you've now (indirectly) answered in the negative my question about a point release to address the type_traits vc-7.1 regression. That's too bad. -- Eric Niebler BoostPro Computing http://www.boostpro.com
On Wed, Dec 1, 2010 at 4:25 AM, Eric Niebler <eric@boostpro.com> wrote:
On 11/30/2010 2:23 PM, Beman Dawes wrote:
Yep, OK to merge to release.
I guess you've now (indirectly) answered in the negative my question about a point release to address the type_traits vc-7.1 regression. That's too bad.
Shouldn't point releases be originating from the actual release anyway? /$
On 1 December 2010 05:25, Henrik Sundberg <storangen@gmail.com> wrote:
On Wed, Dec 1, 2010 at 4:25 AM, Eric Niebler <eric@boostpro.com> wrote:
On 11/30/2010 2:23 PM, Beman Dawes wrote:
Yep, OK to merge to release.
I guess you've now (indirectly) answered in the negative my question about a point release to address the type_traits vc-7.1 regression. That's too bad.
Shouldn't point releases be originating from the actual release anyway?
Our regression testing system currently only supports two fixed branches (trunk and release), so to test a point release we need to keep the release branch dedicated to it. Daniel
On Wed, Dec 1, 2010 at 10:32 AM, Daniel James <dnljms@gmail.com> wrote:
On 1 December 2010 05:25, Henrik Sundberg <storangen@gmail.com> wrote:
On Wed, Dec 1, 2010 at 4:25 AM, Eric Niebler <eric@boostpro.com> wrote:
On 11/30/2010 2:23 PM, Beman Dawes wrote:
Yep, OK to merge to release.
I guess you've now (indirectly) answered in the negative my question about a point release to address the type_traits vc-7.1 regression. That's too bad.
Shouldn't point releases be originating from the actual release anyway?
Our regression testing system currently only supports two fixed branches (trunk and release), so to test a point release we need to keep the release branch dedicated to it.
Not really a problem. It's possible to move the current release branch. Copy the released version to be the release branch again and fix the point release. Reverse merges are also possible. I would suggest fixing the precommit hook to only allow point release fixes during this time. /$
On Nov 30, 2010, at 7:25 PM, Eric Niebler wrote:
On 11/30/2010 2:23 PM, Beman Dawes wrote:
On Tue, Nov 30, 2010 at 9:58 AM, Marshall Clow <mclow.lists@gmail.com>wrote:
On Nov 30, 2010, at 6:44 AM, Hartmut Kaiser wrote:
Since I hate holding back merging to the release branch to the last minute before the next release I would like to start doing this asap. Any idea when this might be allowed again?
It is my belief that once the release is made, the release branch is open for changes again. In fact, I merged files to the release branch last night.
If this is incorrect, then I'm sure one of the release managers will step up and slap me silly^H^H^H^ gently correct me.
Yep, OK to merge to release.
I guess you've now (indirectly) answered in the negative my question about a point release to address the type_traits vc-7.1 regression. That's too bad.
Sorry about that, Eric. -- Marshall
participants (6)
-
Beman Dawes -
Daniel James -
Eric Niebler -
Hartmut Kaiser -
Henrik Sundberg -
Marshall Clow