Re: [boost] Getting Started with Modular Boost Library Maintenance

Subject: Re: [boost] Getting Started with Modular Boost Library Maintenance
From: Daniel James (daniel_at_[hidden])
Date: 2013-12-26 04:24:16

On 26 December 2013 00:28, Beman Dawes <bdawes_at_[hidden]> wrote:
> On Wed, Dec 25, 2013 at 2:52 PM, Cox, Michael <mhcox_at_[hidden]>wrote:
>
>> P.S.  I tried to merge the develop branch onto the master branch in my
>> superproject of my local repositories to simulate a release of boost.  I
>> got a ton of conflicts (looks like mostly submodule reference commits).
>>
>
> AFAIK, the release managers (who are presumably the only folks who would
> ever do super-project merges) are just cherry-picking for now. I'm not sure
> how Daniel's script to update the submodules works.

It just updates submodules to the latest version. Merging will never
really work on the super project as they're updated independently. The
only thing that the current develop branch is good for is making up
for the shortcomings in our testing setup. This is one of the reasons
why Peter Dimov suggested changing the branches in his proposal, and I
suggested that much of what's in the super project should be moved
into submodules.