[1.35.0] List of developers needing to merge changes from 1.34.1 into the trunk
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer. Each developer in this list needs to see if changes need to be merged from 1.34.1. It would be helpful to respond to this message indicating "done" when you've completed this task so I can monitor progress. As an example, consider libs/filesystem/src/operations.cpp: To merge via the command line, cd to the working copy of the trunk, boost-trunk/libs/filesystem/src directory, and enter (all on one line): svn merge -r37476:HEAD https://svn.boost.org/svn/boost/branches/RC_1_34_0/boost/libs/filesystem/src... operations.cpp For TortoiseSVN, right click boost-trunk/libs/filesystem/src/operations.cpp, click "TortoiseSVN", click "Merge", and fill out the dialog. See the attached .jpg for a screen shot of the filled out merge dialog. In the case of operations.cpp, a diff showed that someone had made a fix for a specific compiler and not merged the fix back to trunk. So I went ahead with the merge and committed the resulting file. If the change had not been desired, I would simply have not done the merge, or reverted if I'd been using the command line and had already merged. --Beman ----------------------------------------------------------------- C aaron_windsor libs/graph/doc/history.html M az_sw_dude boost/date_time/date_generators.hpp M bemandawes libs/filesystem/src/operations.cpp M bemandawes libs/serialization/src/codecvt_null.cpp C bemandawes status/explicit-failures-markup.xml C danieljames boost/functional/hash/hash.hpp M danieljames more/version_history.html M david_abrahams boost/python/module_init.hpp M david_abrahams libs/concept_check/stl_concept_covering.cpp M david_abrahams libs/iterator/doc/BidirectionalTraversal.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/ForwardTraversal.html M david_abrahams libs/iterator/doc/function_output_iterator.html M david_abrahams libs/iterator/doc/IncrementableIterator.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 M david_abrahams libs/iterator/doc/LvalueIterator.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/RandomAccessTraversal.html M david_abrahams libs/iterator/doc/ReadableIterator.html M david_abrahams libs/iterator/doc/reverse_iterator.html M david_abrahams libs/iterator/doc/rst2html M david_abrahams libs/iterator/doc/SinglePassIterator.html M david_abrahams libs/iterator/doc/SwappableIterator.html M david_abrahams libs/iterator/doc/transform_iterator.html M david_abrahams libs/iterator/doc/WritableIterator.html M david_abrahams libs/iterator/doc/zip_iterator.html M david_abrahams libs/mpl/test/Jamfile.v2 C david_abrahams libs/python/doc/building.html M david_abrahams libs/python/doc/building.rst M david_abrahams libs/python/doc/index.html A david_abrahams libs/python/example/quickstart/boost-build.jam A david_abrahams libs/python/example/quickstart/embedding.cpp A david_abrahams libs/python/example/quickstart/extending.cpp A david_abrahams libs/python/example/quickstart/script.py A david_abrahams libs/python/example/quickstart/test_extending.py M david_abrahams libs/python/test/select_from_python_test.cpp M david_abrahams more/bugs.htm 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 david_abrahams rst.css C dgregor boost/graph/relax.hpp C dgregor boost/version.hpp D dgregor libs/python/src/aix_init_module.cpp C dgregor more/formal_review_process.htm C eric_niebler boost/xpressive/detail/core/state.hpp C eric_niebler boost/xpressive/detail/dynamic/dynamic.hpp C eric_niebler libs/python/build/VisualStudio/boost_python.dsp C garcia more/formal_review_schedule.html M gennaro_prota more/submission_process.htm M gmelquio boost/numeric/interval/detail/ppc_rounding_control.hpp M grafik libs/algorithm/string/doc/Jamfile.v2 C hkaiser index.htm M johnmaddock boost/regex/v4/basic_regex.hpp C johnmaddock boost/tr1/detail/config.hpp C johnmaddock libs/config/config.htm C johnmaddock libs/math/doc/math.qbk M johnmaddock libs/regex/test/regress/test_icu.cpp M johnmaddock libs/static_assert/doc/static_assert.qbk M johnmaddock libs/tr1/doc/tr1.qbk C johnmaddock libs/type_traits/doc/type_traits.qbk M memring libs/algorithm/string/doc/quickref.xml M memring libs/algorithm/string/doc/release_notes.xml M pdimov boost/detail/atomic_count_gcc.hpp M pdimov boost/function.hpp M ramey boost/archive/basic_text_oprimitive.hpp M ramey boost/archive/basic_xml_archive.hpp M ramey libs/serialization/doc/release.html M ramey libs/serialization/src/basic_oarchive.cpp M ramey libs/serialization/src/extended_type_info.cpp M ramey libs/serialization/src/void_cast.cpp C rogeeff libs/test/test/prg_exec_fail2.cpp 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 C vladimir_prus libs/iostreams/build/Jamfile.v2 M vladimir_prus libs/python/build/Jamfile.v2 C vladimir_prus libs/regex/build/Jamfile.v2 A witt libs/python/example/quickstart/Jamroot
Beman Dawes wrote:
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer.
Each developer in this list needs to see if changes need to be merged from 1.34.1. It would be helpful to respond to this message indicating "done" when you've completed this task so I can monitor progress.
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
These files are all auto-generated from the quickbook tutorial.qbk file. As the latter hasn't changed, all these conflicts stem from changes to the html-generator tool(s). IMO this is just another proof that storing auto-generated files in the repository is a bad idea. (What's the correct thing to do here ? Ignore the changes ?) Regards, Stefan -- ...ich hab' noch einen Koffer in Berlin...
Stefan Seefeld wrote:
Beman Dawes wrote:
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer.
Each developer in this list needs to see if changes need to be merged from 1.34.1. It would be helpful to respond to this message indicating "done" when you've completed this task so I can monitor progress.
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
These files are all auto-generated from the quickbook tutorial.qbk file. As the latter hasn't changed, all these conflicts stem from changes to the html-generator tool(s). IMO this is just another proof that storing auto-generated files in the repository is a bad idea.
(What's the correct thing to do here ? Ignore the changes ?)
Yes. I'll remove them from the offline list I'm keeping. Thanks, --Beman
M pdimov boost/detail/atomic_count_gcc.hpp
I see no change of mine to that file in RC_1_34_0. There's a fix from Eric Niebler for a problem that is already addressed on trunk in a different way.
M pdimov boost/function.hpp
This change http://svn.boost.org/trac/boost/changeset/34499/trunk/boost/boost/function.h... is applied to the trunk and I'm not seeing it in the RC_1_34_0 branch? What does the "M pdimov" mean?
Peter Dimov wrote:
M pdimov boost/detail/atomic_count_gcc.hpp
I see no change of mine to that file in RC_1_34_0. There's a fix from Eric Niebler for a problem that is already addressed on trunk in a different way.
The name that of whoever last changed the file in trunk. Thus it is at best an approximation. It won't be surprising if a lot of the files listed turn out to not require any action. But some do really represent important changes that should have been merged back into the trunk, so we are asking everyone to check.
M pdimov boost/function.hpp
This change
http://svn.boost.org/trac/boost/changeset/34499/trunk/boost/boost/function.h...
is applied to the trunk and I'm not seeing it in the RC_1_34_0 branch? What does the "M pdimov" mean?
M means "Modified". I think the file is flagged because of revsion 37846, which doesn't look like it ever got applied to trunk. See http://svn.boost.org/trac/boost/changeset/37846 --Beman
Beman Dawes:
M pdimov boost/function.hpp
This change
http://svn.boost.org/trac/boost/changeset/34499/trunk/boost/boost/function.h...
is applied to the trunk and I'm not seeing it in the RC_1_34_0 branch? What does the "M pdimov" mean?
M means "Modified".
I think the file is flagged because of revsion 37846, which doesn't look like it ever got applied to trunk. See http://svn.boost.org/trac/boost/changeset/37846
Yes, this seems to need merging, but it's for Thomas and Doug to decide. Is there an easy way to pull the list of whoever made the unmerged changes instead? (The boost/detail/atomic_count_gcc.hpp change requires no action and is covered by a test; you can mark it as such in your offline list. You may also consider putting the list on the trac wiki and let people comment there directly.)
on Thu Nov 01 2007, "Peter Dimov" <pdimov-AT-pdimov.com> wrote:
Beman Dawes:
M pdimov boost/function.hpp
This change
http://svn.boost.org/trac/boost/changeset/34499/trunk/boost/boost/function.h...
is applied to the trunk and I'm not seeing it in the RC_1_34_0 branch? What does the "M pdimov" mean?
M means "Modified".
I think the file is flagged because of revsion 37846, which doesn't look like it ever got applied to trunk. See http://svn.boost.org/trac/boost/changeset/37846
Yes, this seems to need merging, but it's for Thomas and Doug to decide. Is there an easy way to pull the list of whoever made the unmerged changes instead?
I don't know; I merely did what was easiest. Maybe I should have left the names out. -- Dave Abrahams Boost Consulting http://www.boost-consulting.com
David Abrahams:
Yes, this seems to need merging, but it's for Thomas and Doug to decide. Is there an easy way to pull the list of whoever made the unmerged changes instead?
I don't know; I merely did what was easiest. Maybe I should have left the names out.
It's a reasonable way to divide the work even though it ended up as approximate. :-)
on Thu Nov 01 2007, "Peter Dimov" <pdimov-AT-pdimov.com> wrote:
M pdimov boost/detail/atomic_count_gcc.hpp
I see no change of mine to that file in RC_1_34_0.
As I wrote in http://article.gmane.org/gmane.comp.lib.boost.devel/167242, that means you were the last person to change that file on the trunk, not on the branch. -- Dave Abrahams Boost Consulting http://www.boost-consulting.com
Daniel James wrote:
M danieljames more/version_history.html
Done.
Done properly now. It turned out that there were some changes on the branch from 1.34.0 that had never been merged back to trunk and the given merge command missed them. In such cases, it might be better to merge from r33417 (when RC_1_34_0 was branched). Daniel
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer.
Each developer in this list needs to see if changes need to be merged from 1.34.1. It would be helpful to respond to this message indicating "done" when you've completed this task so I can monitor progress.
As an example, consider libs/filesystem/src/operations.cpp:
To merge via the command line, cd to the working copy of the trunk, boost-trunk/libs/filesystem/src directory, and enter (all on one line):
svn merge -r37476:HEAD https://svn.boost.org/svn/boost/branches/RC_1_34_0/boost/libs/ filesystem/src/operations.cpp operations.cpp
For TortoiseSVN, right click boost-trunk/libs/filesystem/src/operations.cpp, click "TortoiseSVN", click "Merge", and fill out the dialog. See the attached .jpg for a screen shot of the filled out merge dialog.
In the case of operations.cpp, a diff showed that someone had made a fix for a specific compiler and not merged the fix back to trunk. So I went ahead with the merge and committed the resulting file. If the change had not been desired, I would simply have not done the merge, or reverted if I'd been using the command line and had already merged.
--Beman
-----------------------------------------------------------------
[snip]
C hkaiser index.htm
No need to merge this, I assume. Regards Hartmut
Beman Dawes wrote:
M johnmaddock boost/regex/v4/basic_regex.hpp C johnmaddock boost/tr1/detail/config.hpp C johnmaddock libs/config/config.htm M johnmaddock libs/regex/test/regress/test_icu.cpp
These have all now been fixed, or already had the patch in them.
C johnmaddock libs/math/doc/math.qbk M johnmaddock libs/static_assert/doc/static_assert.qbk M johnmaddock libs/tr1/doc/tr1.qbk C johnmaddock libs/type_traits/doc/type_traits.qbk
These need up to date links to PDF versions of the docs, I'll attend to that shortly. John.
John Maddock wrote:
Beman Dawes wrote:
M johnmaddock boost/regex/v4/basic_regex.hpp C johnmaddock boost/tr1/detail/config.hpp C johnmaddock libs/config/config.htm M johnmaddock libs/regex/test/regress/test_icu.cpp
These have all now been fixed, or already had the patch in them.
C johnmaddock libs/math/doc/math.qbk M johnmaddock libs/static_assert/doc/static_assert.qbk M johnmaddock libs/tr1/doc/tr1.qbk C johnmaddock libs/type_traits/doc/type_traits.qbk
These need up to date links to PDF versions of the docs, I'll attend to that shortly.
Thanks, --Beman
on Thu Nov 01 2007, Beman Dawes <bdawes-AT-acm.org> wrote:
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer.
Whoa; don't misinterpret the developer names there. As I wrote in http://article.gmane.org/gmane.comp.lib.boost.devel/167242, that list is "The list of files, with their codes, and the last person to modify them on the trunk." That person isn't necessarily the person responsible for the changes on the branch that need to be merged. Did you miss my posting? I'm a little unsure of the reason for yours. I posted a link to the full diffs of the merged result, so people could apply the merges without going through a bunch of svn fun. -- Dave Abrahams Boost Consulting http://www.boost-consulting.com
David Abrahams wrote:
Did you miss my posting? I'm a little unsure of the reason for yours. I posted a link to the full diffs of the merged result, so people could apply the merges without going through a bunch of svn fun.
I personally didn't find full text file diffs very useful. What I really wanted was a visual diff of just the files I'm responsible for. One easy way to get that is to use the TortoiseSVN merge dialog, and click the diff button. TortoiseSVN is set to invoke my preferred visual diff program. OTOH, I did find your listing of names and files very useful, and wanted to be sure developers directed their full attention to it. --Beman
Beman Dawes wrote:
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer. <snip> C eric_niebler boost/xpressive/detail/core/state.hpp C eric_niebler boost/xpressive/detail/dynamic/dynamic.hpp
These fixes don't apply HEAD. OK to ignore these.
C eric_niebler libs/python/build/VisualStudio/boost_python.dsp
Looks like change #37947 by Thomas Witt needs to be merged to HEAD. Thomas, if you don't want to handle this, I will. http://svn.boost.org/trac/boost/changeset/37947/branches/RC_1_34_0/boost/lib... -- Eric Niebler Boost Consulting www.boost-consulting.com
Eric Niebler wrote:
Beman Dawes wrote:
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer. <snip> C eric_niebler boost/xpressive/detail/core/state.hpp C eric_niebler boost/xpressive/detail/dynamic/dynamic.hpp
These fixes don't apply HEAD. OK to ignore these.
Will do.
C eric_niebler libs/python/build/VisualStudio/boost_python.dsp
Looks like change #37947 by Thomas Witt needs to be merged to HEAD. Thomas, if you don't want to handle this, I will.
http://svn.boost.org/trac/boost/changeset/37947/branches/RC_1_34_0/boost/lib...
Unless you hear from Thomas right away, please just go ahead an do it yourself. Thanks, --Beman PS: It looks like Thomas made changes to several libraries without merging the changes back into trunk.
Beman Dawes wrote:
C eric_niebler libs/python/build/VisualStudio/boost_python.dsp Looks like change #37947 by Thomas Witt needs to be merged to HEAD. Thomas, if you don't want to handle this, I will.
http://svn.boost.org/trac/boost/changeset/37947/branches/RC_1_34_0/boost/lib...
Unless you hear from Thomas right away, please just go ahead an do it yourself.
OK, I've merged the changes to boost_python.dsp
PS: It looks like Thomas made changes to several libraries without merging the changes back into trunk.
Yes, this was part of a large set of changes Thomas made to 1.34.1. Thomas, what's the status of changeset 37947 wrt HEAD? -- Eric Niebler Boost Consulting www.boost-consulting.com
On Nov 1, 2007, at 9:37 PM, Eric Niebler wrote:
Beman Dawes wrote:
C eric_niebler libs/python/build/VisualStudio/boost_python.dsp Looks like change #37947 by Thomas Witt needs to be merged to HEAD. Thomas, if you don't want to handle this, I will.
http://svn.boost.org/trac/boost/changeset/37947/branches/RC_1_34_0/boost/lib... Unless you hear from Thomas right away, please just go ahead an do it yourself.
OK, I've merged the changes to boost_python.dsp
PS: It looks like Thomas made changes to several libraries without merging the changes back into trunk.
Yes, this was part of a large set of changes Thomas made to 1.34.1. Thomas, what's the status of changeset 37947 wrt HEAD?
Unless I made a note in the tracker I did not merge any of the patches I applied too HEAD. Thomas
-- Thomas Witt witt@acm.org
Beman Dawes wrote:
M danieljames more/version_history.html
<http://svn.boost.org/trac/boost/ticket/1374>
M david_abrahams more/bugs.htm
<http://svn.boost.org/trac/boost/ticket/1259>
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
The "Getting Started" guide needs to essentially become a boost-root/readme.html (or a sibling). And the boost-root/index.html will go away. <http://svn.boost.org/trac/boost/ticket/1401>
M david_abrahams more/mailing_lists.htm
<http://svn.boost.org/trac/boost/ticket/1361>
C dgregor boost/version.hpp
This never gets merged. And AFAIK it's already updated to the correct version on trunk. But it needs to be updated on branches/release to the trunk version.
C dgregor more/formal_review_process.htm
<http://svn.boost.org/trac/boost/ticket/1350>
C garcia more/formal_review_schedule.html
<http://svn.boost.org/trac/boost/ticket/1351>
M gennaro_prota more/submission_process.htm
<http://svn.boost.org/trac/boost/ticket/1371>
C hkaiser index.htm
See above, about getting started guide. -- -- 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
Beman Dawes wrote:
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer.
Each developer in this list needs to see if changes need to be merged from 1.34.1. It would be helpful to respond to this message indicating "done" when you've completed this task so I can monitor progress.
I've followed Peter Dimov's suggestion, and set up a trac ticket containing the list of unresolved files. See http://svn.boost.org/trac/boost/ticket/1402 Developers, please remove items from this ticket as you do the merge or decide it isn't needed. There isn't any need to also reply to this list posting. Thanks, --Beman
on Thu Nov 01 2007, Beman Dawes <bdawes-AT-acm.org> wrote:
Beman Dawes wrote:
Below is the list of files needing changes merged from 1.34.1 that Dave Abrahams generated, sorted by developer.
Each developer in this list needs to see if changes need to be merged from 1.34.1. It would be helpful to respond to this message indicating "done" when you've completed this task so I can monitor progress.
I've followed Peter Dimov's suggestion, and set up a trac ticket containing the list of unresolved files. See http://svn.boost.org/trac/boost/ticket/1402
I repeat; the list wasn't accurate. See http://article.gmane.org/gmane.comp.lib.boost.devel/167379 -- Dave Abrahams Boost Consulting http://www.boost-consulting.com
participants (10)
-
Beman Dawes -
Daniel James -
David Abrahams -
Eric Niebler -
Hartmut Kaiser -
John Maddock -
Peter Dimov -
Rene Rivera -
Stefan Seefeld -
Thomas Witt