Re: [Boost-build] RC_1_34_0 to trunk reconciliation

From: Rene Rivera (grafikrobot_at_[hidden])
Date: 2007-08-20 12:56:42

Rene Rivera wrote:
> Roland Schwarz wrote:
>> Rene Rivera wrote:
>>> I object... I don't want to loose the trunk changes ;-)
> 
>> So I want to raise the question why it wouldn't be a better base to use 
>> merged_to_RC_1_34_0 instead. At least as I understand this was the 
>> reason why this tag was created at all, not?
> 
> That was exactly why that tag was created. But it only helps if people 
> follow the merge procedures. Which we didn't.

I just did a merge of the 1.34.1 changes to trunk 
<http://svn.boost.org/trac/boost/changeset/38792>. Except for 
python.jam, which as expected has a large number of changes to think 
about. Note I took the more mundane two-way-diff approach and just 
considered the changes individually.

And I'm still waiting for Roland to mention what the *seven* files are, 
since he originally mentioned *six*, and I could only see the original 
*six* are having relevant changes (with the two-way-diff).

-- 
-- Grafik - Don't Assume Anything
-- Redshift Software, Inc. - http://redshift-software.com
-- rrivera/acm.org - grafik/redshift-software.com
-- 102708583/icq - grafikrobot/aim - grafikrobot/yahoo