Re: [boost] [regression] OK to merge? Should tools/regression be asubmodule?

Subject: Re: [boost] [regression] OK to merge? Should tools/regression be asubmodule?
From: Beman Dawes (bdawes_at_[hidden])
Date: 2014-01-02 10:22:07

On Thu, Jan 2, 2014 at 10:10 AM, Peter Dimov <lists_at_[hidden]> wrote:

> Beman Dawes wrote:
>
>> * The directory tools/regression/src/report was missing from svn
>> branches/release, so it is also missing from modular boost master. Although
>> I haven't checked, that probably means the are other unmerged changes in
>> develop.
>>
>> OK to merge develop to master (after suitable testing?)
>>
>
> Judging by the list of changes that
>
> C:\Projects\boost-git\boost>git diff --name-status master..develop
>
> shows, I'd think twice before doing such a merge. :-)
>
> M    .gitmodules
> M    Jamroot
> M    boostcpp.jam
> A    boostcpp.py
> M    bootstrap.bat
> M    bootstrap.sh
> M    doc/Jamfile.v2
> M    doc/pdf/Jamfile.v2
> M    doc/src/boost.xml
> M    doc/src/minimal.css
> A    doc/test/test.mml
> A    doc/test/test.png
> M    doc/test/test.qbk
> A    doc/test/test.svg
> M    libs/accumulators
> <long list>
>

The merge would have to be cherry picked:-(

That would be an example of why making tools/regression a submodule is
worthwhile. If we do that first, and then the merge afterwards, life gets
simpler.

--Beman