From: Rene Rivera (grafikrobot_at_[hidden])
Date: 2007-08-18 10:49:32
Roland Schwarz wrote:
> I attempted a 3-way merge of
>
> BOOST_ROOT/tools/build
>
> between
>
> Base : RC_1_34_0_freeze
> Tree1: RC_1_34_0
> Tree2: trunk
>
> Essentially I found 6 files that need to be changed:
>
> BOOST_ROOT/tools/build/v2/tools/gcc.jam
> BOOST_ROOT/tools/build/v2/tools/python.jam
> BOOST_ROOT/tools/build/v2/tools/testing.jam
> BOOST_ROOT/tools/build/v2/tools/vacpp.jam
> BOOST_ROOT/tools/build/v2/util/os.jam
> BOOST_ROOT/tools/build/v2/util/sequence.jam
>
> This is what would happen when applying the changes:
> All six files equal the versions from RC_1_34_0 i.e. latest release.
The problem is that there are changes made to trunk also. Hence a 3-way
merge would leave those files different from both trunk and RC_1_34_0.
> If there are no objections I'll commit the changes.
I object... I don't want to loose the trunk changes ;-)
-- -- 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