From: Roland Schwarz (roland.schwarz_at_[hidden])
Date: 2007-08-18 09:51:35
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.
Rest of trunk unchanged.
If there are no objections I'll commit the changes.
Btw.: I am also trying to run the tests with mingw on windows, and this is
looking rather good so far.
Roland aka speedsnail