Subject: Re: [1.35] ** ATTENTION: Unmerged changes from 1.34.1 **
Newsgroups: gmane.comp.lib.boost.devel
Date: 2007-10-31 20:02:24 GMT (44 weeks, 3 days, 12 hours and 15 minutes ago)
on Mon Oct 29 2007, David Abrahams <dave-AT-boost-consulting.com> wrote: >> I strongly suggest that all other Boost authors do the command above >> and inspect "merged (M)," "conflict (C)," and "added (A)" files that >> they may have touched during the 1.34.x release cycle, or we may find >> that we've dropped important improvements. One place you should >> especially check is in your test/ directories, to make sure that you >> haven't unintentionally dropped any tests between then and now. If >> your testing is complete and you make sure nothing is dropped, in >> theory, dropped features and bugfixes won't be able to hide. But >> there are also documentation changes, so I wouldn't take anything for >> granted> > Err, wait: that diff doesn't do what I thought it did. Okay, here's what I did: looked at http://svn.boost.org/trac/boost/log/branches/RC_1_34_0 for the first revision of the RC_1_34_1 branch, which turned out to be 37476. Then I did: svn co https://svn.boost.org/svn/boost/trunk boost-merge cd boost-merge && svn merge -r37476:HEAD https://svn.boost.org/svn/boost/branches/RC_1_34_0/boost . That merged all the changes from the 1.34.0 branch into the trunk. It seemed to actually be quite smart, avoiding most changes that were already done in both the trunk and the branch. The list of files, with their codes, and the last person to modify them on the trunk, is attached here:
M ramey boost/archive/basic_text_oprimitive.hpp M ramey boost/archive/basic_xml_archive.hpp M az_sw_dude boost/date_time/date_generators.hpp M pdimov boost/detail/atomic_count_gcc.hpp M pdimov boost/function.hpp C danieljames boost/functional/hash/hash.hpp C dgregor boost/graph/relax.hpp M gmelquio boost/numeric/interval/detail/ppc_rounding_control.hpp M david_abrahams boost/python/module_init.hpp M johnmaddock boost/regex/v4/basic_regex.hpp C johnmaddock boost/tr1/detail/config.hpp C dgregor boost/version.hpp C eric_niebler boost/xpressive/detail/core/state.hpp C eric_niebler boost/xpressive/detail/dynamic/dynamic.hpp C hkaiser index.htm M grafik libs/algorithm/string/doc/Jamfile.v2 M memring libs/algorithm/string/doc/quickref.xml M memring libs/algorithm/string/doc/release_notes.xml M david_abrahams libs/concept_check/stl_concept_covering.cpp C johnmaddock libs/config/config.htm M bemandawes libs/filesystem/src/operations.cpp C aaron_windsor libs/graph/doc/history.html C vladimir_prus libs/iostreams/build/Jamfile.v2 M david_abrahams libs/iterator/doc/BidirectionalTraversal.html M david_abrahams libs/iterator/doc/ForwardTraversal.html M david_abrahams libs/iterator/doc/IncrementableIterator.html M david_abrahams libs/iterator/doc/LvalueIterator.html M david_abrahams libs/iterator/doc/RandomAccessTraversal.html M david_abrahams libs/iterator/doc/ReadableIterator.html M david_abrahams libs/iterator/doc/SinglePassIterator.html M david_abrahams libs/iterator/doc/SwappableIterator.html M david_abrahams libs/iterator/doc/WritableIterator.html M david_abrahams libs/iterator/doc/counting_iterator.html M david_abrahams libs/iterator/doc/facade-and-adaptor.html M david_abrahams libs/iterator/doc/filter_iterator.html M david_abrahams libs/iterator/doc/function_output_iterator.html M david_abrahams libs/iterator/doc/index.html M david_abrahams libs/iterator/doc/indirect_iterator.html M david_abrahams libs/iterator/doc/interoperability-revisited.rst M david_abrahams libs/iterator/doc/iterator_adaptor.html M david_abrahams libs/iterator/doc/iterator_archetypes.html M david_abrahams libs/iterator/doc/iterator_concepts.html M david_abrahams libs/iterator/doc/iterator_facade.html M david_abrahams libs/iterator/doc/iterator_traits.html C david_abrahams libs/iterator/doc/new-iter-concepts.html M david_abrahams libs/iterator/doc/permutation_iterator.html M david_abrahams libs/iterator/doc/pointee.html M david_abrahams libs/iterator/doc/reverse_iterator.html M david_abrahams libs/iterator/doc/rst2html M david_abrahams libs/iterator/doc/transform_iterator.html M david_abrahams libs/iterator/doc/zip_iterator.html C johnmaddock libs/math/doc/math.qbk M david_abrahams libs/mpl/test/Jamfile.v2 M vladimir_prus libs/python/build/Jamfile.v2 C eric_niebler libs/python/build/VisualStudio/boost_python.dsp C david_abrahams libs/python/doc/building.html M david_abrahams libs/python/doc/building.rst M david_abrahams libs/python/doc/index.html C stefan libs/python/doc/tutorial/doc/html/index.html C stefan libs/python/doc/tutorial/doc/html/python/embedding.html C stefan libs/python/doc/tutorial/doc/html/python/exposing.html C stefan libs/python/doc/tutorial/doc/html/python/functions.html C stefan libs/python/doc/tutorial/doc/html/python/hello.html C stefan libs/python/doc/tutorial/doc/html/python/object.html C stefan libs/python/doc/tutorial/doc/html/python/techniques.html A + ? libs/python/example/quickstart A + 38154 witt libs/python/example/quickstart/Jamroot A + 37585 david_abrahams libs/python/example/quickstart/boost-build.jam A + 37585 david_abrahams libs/python/example/quickstart/embedding.cpp A + 37585 david_abrahams libs/python/example/quickstart/extending.cpp A + 37585 david_abrahams libs/python/example/quickstart/script.py A + 37585 david_abrahams libs/python/example/quickstart/test_extending.py D dgregor libs/python/src/aix_init_module.cpp M david_abrahams libs/python/test/select_from_python_test.cpp C vladimir_prus libs/regex/build/Jamfile.v2 M johnmaddock libs/regex/test/regress/test_icu.cpp M ramey libs/serialization/doc/release.html M ramey libs/serialization/src/basic_oarchive.cpp M bemandawes libs/serialization/src/codecvt_null.cpp M ramey libs/serialization/src/extended_type_info.cpp M ramey libs/serialization/src/void_cast.cpp M johnmaddock libs/static_assert/doc/static_assert.qbk C rogeeff libs/test/test/prg_exec_fail2.cpp M johnmaddock libs/tr1/doc/tr1.qbk C johnmaddock libs/type_traits/doc/type_traits.qbk M david_abrahams more/bugs.htm C dgregor more/formal_review_process.htm C garcia more/formal_review_schedule.html M david_abrahams more/getting_started/detail/build-from-source-head.rst M david_abrahams more/getting_started/detail/build-from-source-tail.rst M david_abrahams more/getting_started/detail/common-unix.rst M david_abrahams more/getting_started/detail/common-windows.rst M david_abrahams more/getting_started/detail/conclusion.rst M david_abrahams more/getting_started/detail/release-variables.rst C david_abrahams more/getting_started/unix-variants.html M david_abrahams more/getting_started/unix-variants.rst C david_abrahams more/getting_started/windows.html M david_abrahams more/getting_started/windows.rst M david_abrahams more/mailing_lists.htm M gennaro_prota more/submission_process.htm M danieljames more/version_history.html M david_abrahams rst.css C bemandawes status/explicit-failures-markup.xml
Then I did svn diff to see what it changed, and it does seem like some important things are (currently) being dropped. I have also a .zip file containing all that diff output to http://www.boost-consulting.com/writing/merge-1.34-to-trunk.zip (150K) in case you don't want to repeat this process yourself. If you have files in the list above, please at least download and decompress the .zip to see if you need to merge anything to trunk. Thanks, Dave
-- Dave Abrahams Boost Consulting http://www.boost-consulting.com
_______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost