Differences between 'trunk' and 'release' right before 1.44 code freeze

As far as I know, the code freeze for the 1.44 release is scheduled for tomorrow, July 12th. There are about 40 files that exist on the release branch only (do not, or no longer) exist on the trunk. Are these files that were deleted on the trunk and the deletions were never 'merged' to the release branch? There are almost 100 files that exist on the trunk that do not exist at all on the release branch. I'm confident that some of these are "works in progress", not ready for the 1.44 release. I'm also confident that others are work that should be in the 1.44 release - but I certainly can't tell the difference. There are also about 2000 files that differ (some in minor ways, some significantly) between the trunk and the release branch. If you fixed a bug during the bug sprint, you need to merge your changes to the release branch! Here's a list of the files that exist only "on one side". The attached HTML file shows all the differences. Files that exist only in 'release/' boost/asio/detail/gcc_fenced_block.hpp boost/smart_ptr/enable_shared_from_this2.hpp doc/test/accumulators.tag doc/test/dvips.version doc/test/gs.version doc/test/html/images/accumulators doc/test/latex.version libs/math/doc/html/standalone_HTML.manifest libs/range/doc/html/range/reference/adaptors/adaptors_reference.html libs/range/doc/reference/adaptors/adjacent_filtered.html libs/range/doc/reference/adaptors/copied.html libs/range/doc/reference/adaptors/filtered.html libs/range/doc/reference/adaptors/indexed.html libs/range/doc/reference/adaptors/indirected.html libs/range/doc/reference/adaptors/map_keys.html libs/range/doc/reference/adaptors/map_values.html libs/range/doc/reference/adaptors/replaced.html libs/range/doc/reference/adaptors/replaced_if.html libs/range/doc/reference/adaptors/reversed.html libs/range/doc/reference/adaptors/sliced.html libs/range/doc/reference/adaptors/strided.html libs/range/doc/reference/adaptors/tokenized.html libs/range/doc/reference/adaptors/transformed.html libs/range/doc/reference/adaptors/uniqued.html libs/spirit/example/scheme/detail libs/spirit/example/scheme/out.txt libs/spirit/example/scheme/sexpr.hpp libs/spirit/example/scheme/sexpr_test.cpp libs/spirit/example/scheme/sexpr_test.txt libs/spirit/example/scheme/simple_print.hpp libs/spirit/example/scheme/test/generate_qiexpr libs/spirit/example/scheme/test/parse_qiexpr libs/spirit/example/scheme/test/sexpr libs/spirit/example/scheme/utree_test.cpp libs/test/example/cla/Jamfile libs/test/example/est_example1.cpp libs/test/example/est_example2.cpp libs/test/example/unit_test_example_011.cpp libs/test/example/unit_test_example_012.cpp libs/test/test/CMakeLists.txt Files that exist only in 'trunk/' boost/asio/detail/gcc_hppa_fenced_block.hpp boost/asio/detail/gcc_sync_fenced_block.hpp boost/detail/extended_integer.hpp boost/iterator/function_input_iterator.hpp boost/random/detail/generator_seed_seq.hpp boost/random/detail/operators.hpp boost/random/discrete_distribution.hpp boost/random/extreme_value_distribution.hpp boost/random/seed_seq.hpp boost/random/shuffle_order.hpp boost/random/weibull_distribution.hpp boost/signals2/detail/foreign_ptr.hpp boost/smart_ptr/enable_shared_from_raw.hpp boost/test/included/execution_monitor.hpp boost/test/prod_tools.hpp boost/test/utils/setcolor.hpp boost/typeof/unsupported.hpp libs/exception/doc/source libs/filesystem/test/resize_file_test.txt libs/filesystem/test/xx libs/graph/quickbook libs/interprocess/proj/vc7ide/intermodule_singleton_test.vcproj libs/interprocess/test/intermodule_singleton_test.cpp libs/io/doc/quoted_manip.html libs/io/test/quoted_manip_test.cpp libs/iterator/doc/function_input_iterator.html libs/iterator/doc/function_input_iterator.rst libs/iterator/test/function_input_iterator_test.cpp libs/multi_array/example/resize_from_other.cpp libs/multi_array/test/reverse_view.cpp libs/parameter/doc/README.txt libs/parameter/test/literate libs/ptr_container/test/const_element_containers.cpp libs/python/example/quickstart/bin libs/random/example/password.cpp libs/random/test/chi_squared_test.hpp libs/random/test/test_binomial.cpp libs/random/test/test_binomial_distribution.cpp libs/random/test/test_discrete.cpp libs/random/test/test_discrete_distribution.cpp libs/random/test/test_extreme_value.cpp libs/random/test/test_extreme_value_distribution.cpp libs/random/test/test_gamma.cpp libs/random/test/test_gamma_distribution.cpp libs/random/test/test_poisson.cpp libs/random/test/test_poisson_distribution.cpp libs/random/test/test_seed_seq.cpp libs/random/test/test_weibull.cpp libs/random/test/test_weibull_distribution.cpp libs/range/doc/html/range/reference/algorithms/range_algorithm_introduction.html libs/range/doc/html/range/reference/overview.html libs/range/test/algorithm_test/copy_n.cpp libs/range/test/algorithm_test/remove_copy.cpp libs/range/test/algorithm_test/remove_copy_if.cpp libs/range/test/algorithm_test/replace_copy.cpp libs/range/test/algorithm_test/replace_copy_if.cpp libs/range/test/algorithm_test/reverse_copy.cpp libs/range/test/algorithm_test/rotate_copy.cpp libs/range/test/algorithm_test/search_n.cpp libs/range/test/algorithm_test/swap_ranges.cpp libs/range/test/algorithm_test/unique_copy.cpp libs/range/test/replace_copy.cpp libs/smart_ptr/test/enable_shared_from_raw_test.cpp libs/spirit/doc/Missing.txt libs/spirit/doc/html/spirit/lex/reference/concepts libs/spirit/example/scheme/test/qi/calc.scm libs/test/doc/Jamfile.v2 libs/test/doc/html/utf/user-guide/test-output/FPT.html libs/test/doc/src/Jamfile.v2 libs/test/doc/src/btl-toc.xml libs/test/doc/src/btl.xml libs/test/doc/src/execution-monitor.xml libs/test/doc/src/faq.xml libs/test/doc/src/minimal-testing.xml libs/test/doc/src/program-execution-monitor.xml libs/test/doc/src/snippet libs/test/doc/src/tutorial.hello-the-testing-world.xml libs/test/doc/src/tutorial.intro-in-testing.xml libs/test/doc/src/tutorial.new-year-resolution.xml libs/test/doc/src/utf.testing-tools.xml libs/test/doc/src/utf.tutorials.xml libs/test/doc/src/utf.usage-recommendations.xml libs/test/doc/src/utf.user-guide.runtime-config.xml libs/test/doc/src/utf.users-guide.fixture.xml libs/test/doc/src/utf.users-guide.test-organization.xml libs/test/doc/src/utf.users-guide.test-output.xml libs/test/doc/src/utf.users-guide.xml libs/test/doc/src/utf.xml libs/test/doc/src/xsl libs/test/doc/utf-boostbook.jam libs/test/example/test_example1.cpp libs/test/example/test_example2.cpp libs/test/example/unit_test_example_13.cpp libs/units/example/autoprefixes.cpp tools/build/v2/test/exit_status.py tools/build/v2/tools/doxygen tools/build/v2/tools/xsltproc tools/release/merge2release.bat -- Marshall

On 7/11/2010 12:58 PM, Marshall Clow wrote:
Does anybody else find it deeply ironic that there is a file that someone bothered to name "merge2release.bat" that, in fact, has not been merged to release? BTW, thank you for this very valuable service, Marshall! -- Eric Niebler BoostPro Computing http://www.boostpro.com
participants (2)
-
Eric Niebler
-
Marshall Clow