
I've been looking at the trunk and release branch, I've noticed that there are a lot of files that exist only in one or the other. My suspicion is that this is a result of work not getting merged to the release branch. The last day for "major code changes" for the 1.44 release is Monday, July 5th, Here's a list of what I found: Only in 'release/' boost/fusion/adapted/class/class_iterator.hpp boost/fusion/adapted/class/detail/at_impl.hpp boost/fusion/adapted/class/detail/at_key_impl.hpp boost/fusion/adapted/class/detail/begin_impl.hpp boost/fusion/adapted/class/detail/category_of_impl.hpp boost/fusion/adapted/class/detail/end_impl.hpp boost/fusion/adapted/class/detail/has_key_impl.hpp boost/fusion/adapted/class/detail/is_sequence_impl.hpp boost/fusion/adapted/class/detail/is_view_impl.hpp boost/fusion/adapted/class/detail/size_impl.hpp boost/fusion/adapted/class/detail/value_at_impl.hpp boost/fusion/adapted/class/detail/value_at_key_impl.hpp boost/fusion/adapted/class/extension.hpp boost/lambda/detail/control_structures_impl.hpp boost/numeric/ublas/tempfile.2.tmp boost/numeric/ublas/tempfile.3.tmp boost/numeric/ublas/tempfile.4.tmp boost/numeric/ublas/tempfile.tmp 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/filesystem/doc libs/filesystem/example libs/filesystem/src libs/filesystem/test/convenience_test.cpp libs/filesystem/test/deprecated_test.cpp libs/filesystem/test/equivalent.cpp libs/filesystem/test/fstream_test.cpp libs/filesystem/test/large_file_support_test.cpp libs/filesystem/test/lpath.hpp libs/filesystem/test/msvc libs/filesystem/test/operations_test.cpp libs/filesystem/test/path_test.cpp libs/filesystem/test/wide_test.cpp libs/fusion/test/functional/make_unfused_generic.cpp libs/fusion/test/functional/make_unfused_lvalue_args.cpp libs/fusion/test/functional/make_unfused_rvalue_args.cpp libs/fusion/test/functional/unfused_generic.cpp libs/fusion/test/functional/unfused_lvalue_args.cpp libs/fusion/test/functional/unfused_rvalue_args.cpp libs/graph/example/kolmogorov-eg.cpp libs/graph/test/kolmogorov_max_flow_test.cpp 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/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 Only in 'trunk/' boost/detail/extended_integer.hpp boost/filesystem/detail boost/filesystem/v2 boost/filesystem/v3 boost/fusion/algorithm/iteration/iter_fold.hpp boost/fusion/algorithm/iteration/reverse_fold.hpp boost/fusion/algorithm/iteration/reverse_iter_fold.hpp boost/fusion/include/iter_fold.hpp boost/fusion/include/reverse_fold.hpp boost/fusion/include/reverse_iter_fold.hpp boost/graph/boykov_kolmogorov_max_flow.hpp boost/graph/loop_erased_random_walk.hpp boost/graph/random_spanning_tree.hpp boost/io/detail boost/iterator/function_input_iterator.hpp boost/numeric/ublas/assignment.hpp boost/numeric/ublas/functional.hpp-0 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/serialization/item_version_type.hpp boost/signals2/detail/foreign_ptr.hpp boost/smart_ptr/enable_shared_from_raw.hpp boost/spirit/home/karma/detail/attributes.hpp boost/spirit/home/karma/detail/get_stricttag.hpp boost/spirit/home/karma/directive/strict_relaxed.hpp boost/spirit/home/karma/nonterminal/debug_handler.hpp boost/spirit/home/karma/nonterminal/debug_handler_state.hpp boost/spirit/home/karma/nonterminal/simple_trace.hpp boost/spirit/home/qi/detail/attributes.hpp boost/spirit/home/qi/nonterminal/debug_handler_state.hpp boost/spirit/include/karma_strict_relaxed.hpp boost/system/api_config.hpp boost/test/included/execution_monitor.hpp boost/test/prod_tools.hpp boost/test/utils/setcolor.hpp boost/type_traits/is_lvalue_reference.hpp boost/type_traits/is_rvalue_reference.hpp boost/typeof/unsupported.hpp libs/algorithm/string/test/find_format_test.cpp libs/exception/doc/source libs/filesystem/test/resize_file_test.txt libs/filesystem/test/xx libs/filesystem/v2 libs/filesystem/v3 libs/format/test/format_test_enum.cpp libs/fusion/test/algorithm/fold.hpp libs/fusion/test/algorithm/fold2.cpp libs/fusion/test/algorithm/iter_fold.cpp libs/fusion/test/algorithm/reverse_fold.cpp libs/fusion/test/algorithm/reverse_iter_fold.cpp libs/graph/doc/boykov_kolmogorov_max_flow.html libs/graph/doc/figs/bk_max_flow.gif libs/graph/doc/figs/warning.png libs/graph/example/boykov_kolmogorov-eg.cpp libs/graph/quickbook libs/graph/test/boykov_kolmogorov_max_flow_test.cpp libs/graph/test/random_spanning_tree_test.cpp 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/iostreams/test/deprecated_file_descriptor_test.cpp libs/iostreams/test/detail/file_handle.hpp libs/iterator/doc/function_input_iterator.html libs/iterator/doc/function_input_iterator.rst libs/iterator/test/function_input_iterator_test.cpp libs/lambda/test/result_of_tests.cpp libs/multi_array/example/resize_from_other.cpp libs/multi_array/test/reverse_view.cpp libs/numeric/ublas/bench5 libs/numeric/ublas/doc/samples/assignment_examples.cpp libs/numeric/ublas/test/sparse_view_test.cpp libs/numeric/ublas/test/test_assignment.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/serialization/test/test_diamond_complex.cpp libs/serialization/vc7ide/test_diamond_complex.vcproj libs/smart_ptr/test/enable_shared_from_raw_test.cpp libs/smart_ptr/test/make_shared_fp_test.cpp libs/spirit/doc/Missing.txt libs/spirit/doc/html/spirit/lex/reference/concepts libs/spirit/doc/html/spirit/what_s_new/spirit_2_4.html libs/spirit/example/scheme libs/spirit/test/karma/debug.cpp libs/spirit/test/karma/karma_optional_double.cpp libs/spirit/test/karma/semantic_action_attribute.cpp libs/spirit/test/lex/regression006.cpp libs/spirit/test/qi/attr_with_action.cpp libs/system/src/local_free_on_destruction.hpp libs/system/test/dynamic_link_test.cpp libs/system/test/throw_test.cpp 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/type_traits/doc/html/boost_typetraits/reference/is_lvalue_reference.html libs/type_traits/doc/html/boost_typetraits/reference/is_rvalue_reference.html libs/type_traits/doc/is_lvalue_reference.qbk libs/type_traits/doc/is_rvalue_reference.qbk libs/type_traits/test/is_lvalue_reference_test.cpp libs/type_traits/test/is_rvalue_reference_test.cpp libs/type_traits/test/tricky_rvalue_test.cpp libs/units/example/autoprefixes.cpp libs/utility/initialized_test.cpp libs/utility/initialized_test_fail1.cpp libs/utility/initialized_test_fail2.cpp libs/utility/value_init_workaround_test.cpp tools/boostbook/xsl/html-base.xsl tools/build/v2/test/exit_status.py tools/build/v2/tools/doxygen tools/build/v2/tools/xsltproc tools/release/merge2release.bat -- Marshall

Marshall Clow schrieb:
I've been looking at the trunk and release branch, I've noticed that there are a lot of files that exist only in one or the other.
My suspicion is that this is a result of work not getting merged to the release branch. The last day for "major code changes" for the 1.44 release is Monday, July 5th,
Here's a list of what I found: [snip]
Thanks for the heads-up! I just merged all outstanding Fusion-related changesets. As of revision 63560, Fusion in the release branch should not be different to the trunk one. -Christopher

Bug #4092 fixes have been in trunk since before 1.43 was released, it's still not made it into release. The fix is required for property_tree (via graph) to compile with VS10. KTC

On Sat, 3 Jul 2010, KTC wrote:
Bug #4092 fixes have been in trunk since before 1.43 was released, it's still not made it into release. The fix is required for property_tree (via graph) to compile with VS10.
I just merged both of these patches (the one for #3594 and the one for #4092) into the release branch in r63563. -- Jeremiah Willcock

Marshall Clow wrote:
I've been looking at the trunk and release branch, I've noticed that there are a lot of files that exist only in one or the other. ... Here's a list of what I found:
Only in 'trunk/' ... libs/utility/initialized_test.cpp libs/utility/initialized_test_fail1.cpp libs/utility/initialized_test_fail2.cpp libs/utility/value_init_workaround_test.cpp
Thanks Marshall, I just added them, yesterday: https://svn.boost.org/trac/boost/changeset/63638 FYI, These tests verify the fixes of two utility/value_init tickets: https://svn.boost.org/trac/boost/ticket/3472 "Setting value_initialized<T> to a value when T is a top-level const", resolved by adding a new template to value_init.hpp, boost::initialized<T>, which provides direct-initialization as well as value-initialization. https://svn.boost.org/trac/boost/ticket/3869, "Unconditional call to memset in value_initialized()", resolved by making the existing memset workaround conditional, based on a new compiler defect macro, BOOST_NO_COMPLETE_VALUE_INITIALIZATION. Kind regards, Niels -- Niels Dekker http://www.xs4all.nl/~nd/dekkerware Scientific programmer at LKEB, Leiden University Medical Center

As of this morning (July 5th, change set 63668) , there were still a lot of differences between the trunk and release branch. Only in 'release' 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/asio/example/timeouts/accept_timeout.cpp libs/asio/example/timeouts/connect_timeout.cpp libs/asio/example/timeouts/datagram_receive_timeout.cpp libs/asio/example/timeouts/stream_receive_timeout.cpp libs/filesystem/doc libs/filesystem/example libs/filesystem/src libs/filesystem/test/convenience_test.cpp libs/filesystem/test/deprecated_test.cpp libs/filesystem/test/equivalent.cpp libs/filesystem/test/fstream_test.cpp libs/filesystem/test/large_file_support_test.cpp libs/filesystem/test/lpath.hpp libs/filesystem/test/msvc libs/filesystem/test/operations_test.cpp libs/filesystem/test/path_test.cpp libs/filesystem/test/wide_test.cpp 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 Only in 'trunk/' boost/asio/detail/gcc_arm_fenced_block.hpp boost/asio/detail/object_pool.hpp boost/detail/extended_integer.hpp boost/filesystem/detail boost/filesystem/v2 boost/filesystem/v3 boost/io/detail boost/iterator/function_input_iterator.hpp boost/numeric/ublas/assignment.hpp boost/numeric/ublas/doxydoc.hpp boost/numeric/ublas/functional.hpp-0 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/serialization/item_version_type.hpp boost/signals2/detail/foreign_ptr.hpp boost/smart_ptr/enable_shared_from_raw.hpp boost/system/api_config.hpp boost/test/included/execution_monitor.hpp boost/test/prod_tools.hpp boost/test/utils/setcolor.hpp boost/typeof/unsupported.hpp libs/algorithm/string/test/find_format_test.cpp libs/asio/example/timeouts/async_tcp_client.cpp libs/asio/example/timeouts/blocking_tcp_client.cpp libs/asio/example/timeouts/blocking_udp_client.cpp libs/asio/example/timeouts/server.cpp libs/exception/doc/source libs/filesystem/test/resize_file_test.txt libs/filesystem/test/xx libs/filesystem/v2 libs/filesystem/v3 libs/format/test/format_test_enum.cpp 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/iostreams/test/deprecated_file_descriptor_test.cpp libs/iostreams/test/detail/file_handle.hpp 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/numeric/ublas/test/sparse_view_test.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/serialization/test/test_diamond_complex.cpp libs/serialization/vc7ide/test_diamond_complex.vcproj libs/smart_ptr/test/enable_shared_from_raw_test.cpp libs/smart_ptr/test/make_shared_fp_test.cpp libs/spirit/doc/Missing.txt libs/spirit/doc/html/spirit/lex/reference/concepts libs/spirit/example/scheme/test/qi/calc.scm libs/system/src/local_free_on_destruction.hpp libs/system/test/dynamic_link_test.cpp libs/system/test/throw_test.cpp 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/boostbook/xsl/html-base.xsl tools/build/v2/test/exit_status.py tools/build/v2/tools/doxygen tools/build/v2/tools/xsltproc tools/quickbook/test/doc-info-3.gold tools/quickbook/test/doc-info-3.quickbook tools/quickbook/test/doc-info-4.gold tools/quickbook/test/doc-info-4.quickbook tools/quickbook/test/empty.quickbook tools/quickbook/test/mismatched-brackets-1.gold tools/quickbook/test/mismatched-brackets-1.quickbook tools/quickbook/test/mismatched-brackets-2.gold tools/quickbook/test/mismatched-brackets-2.quickbook tools/quickbook/test/mismatched-brackets-3.quickbook tools/release/merge2release.bat Attached is an HTML file showing all the differences - not just missing files but files that differ between the trunk and release. Some of these are going to be bug fixes that haven't been merged, some of them are ongoing development that isn't ready for release. Some of it is just my script being picky; since (for example) $Date will get expanded by SVN, and that shows up as a difference, too. -- Marshall
participants (5)
-
Christopher Schmidt
-
Jeremiah Willcock
-
KTC
-
Marshall Clow
-
Niels Dekker - address until 2010-10-10