There seem to be a large number of changes to trunk that have not been merged into branches/release. [snip]

Regarding Statechart, I see the following differences between trunk & release: libs/statechart/CMakeLists.txt libs/statechart/doc/index.html libs/statechart/example/CMakeLists.txt libs/statechart/module.cmake libs/statechart/test/CMakeLists.txt The index.html difference is intended, all others don't seem to be real. TortoiseSVN shows them as "replaced", but the trunk & release versions are identical. Maybe you are getting such a long list of unmerged changes because the cmake files for other libraries were also replaced? -- Andreas Huber When replying by private email, please remove the words spam and trap from the address shown in the header.

Beman Dawes wrote:

There seem to be a large number of changes to trunk that have not been merged into branches/release. Perhaps a lot of merges were forgotten after the bug fixing sprint. All of the libraries listed below are suspect, although some may just be holding changes until after the release.

I checked my libs, and most of the diffs are related to changes to the CMake build system. I don't know whether the diffs are intentional or not. -- Eric Niebler BoostPro Computing http://www.boostpro.com

Beman Dawes wrote:

"svn diff" can be used to see exactly what changes have not been merged. Here is a simple Windows batch file that eases typing; perhaps someone could post a Unix equivalent.

@echo off if not %1$==$ goto usage_ok echo Usage: unmerged library-name goto done

:usage_ok svn diff %2 %3 %4 %5 %6 http://svn.boost.org/svn/boost/branches/release/boost/%1.hpp http://svn.boost.org/svn/boost/trunk/boost/%1.hpp svn diff %2 %3 %4 %5 %6 http://svn.boost.org/svn/boost/branches/release/boost/%1 http://svn.boost.org/svn/boost/trunk/boost/%1 svn diff %2 %3 %4 %5 %6 http://svn.boost.org/svn/boost/branches/release/libs/%1 http://svn.boost.org/svn/boost/trunk/libs/%1

:done

Here's the equivalent for bash: #!/bin/bash if [ $# -eq 1 ]; then library="$1"; shift for tail in boost/$library.hpp boost/$library libs/$library; do svn diff "${@}" http://svn.boost.org/svn/boost/{branches/release,trunk}/$tail done else echo >&2 Usage: $0 library-name exit 1 fi _____ Rob Stewart robert.stewart@sig.com Software Engineer, Core Software using std::disclaimer; Susquehanna International Group, LLP http://www.sig.com IMPORTANT: The information contained in this email and/or its attachments is confidential. If you are not the intended recipient, please notify the sender immediately by reply and immediately delete this message and all its attachments. Any review, use, reproduction, disclosure or dissemination of this message or any attachment by an unintended recipient is strictly prohibited. Neither this message nor any attachment is intended as or should be construed as an offer, solicitation or recommendation to buy or sell any security or other financial instrument. Neither the sender, his or her employer nor any of their respective affiliates makes any warranties as to the completeness or accuracy of any of the information contained herein or that this message or any of its attachments is free of viruses.

Beman Dawes wrote:

There seem to be a large number of changes to trunk that have not been merged into branches/release. Perhaps a lot of merges were forgotten after the bug fixing sprint. All of the libraries listed below are suspect, although some may just be holding changes until after the release.

"svn diff" can be used to see exactly what changes have not been merged. Here is a simple Windows batch file that eases typing; perhaps someone could post a Unix equivalent.

program_options

I believe the script is confused here. There are no actual code changes, just mergeinfo changes -- which are expected and will always be there. See below for svn diff output. - Volodya ghost@wind:~/Work/Boost/boost-svn$ svn diff ^/branches/release/boost/program_options ^/trunk/boost/program_options Property changes on: . ___________________________________________________________________ Deleted: svn:mergeinfo Reverse-merged /trunk/boost/boost/program_options:r22824-38326 Reverse-merged /devel/boost/program_options:r38327-38328 Reverse-merged /trunk/boost/program_options:r38329-55194,55224 ghost@wind:~/Work/Boost/boost-svn$ svn diff ^/branches/release/libs/program_options ^/trunk/libs/program_options Property changes on: . ___________________________________________________________________ Deleted: svn:mergeinfo Reverse-merged /trunk/boost/libs/program_options:r22824-38326 Reverse-merged /devel/libs/program_options:r38327-38328 Reverse-merged /trunk/libs/program_options:r38329-55193,55224

f.y.i, Theres a difference in Signals due to the fix for #2023 (made to Trunk ~14 months ago) never having made it to the release branch. -- View this message in context: http://www.nabble.com/-1.40.0--Unmerged-changes-delaying-beta-1-tp24879861p2... Sent from the Boost - Dev mailing list archive at Nabble.com.

Beman Dawes <bdawes <at> acm.org> writes:

There seem to be a large number of changes to trunk that have not been merged into branches/release. Perhaps a lot of merges were forgotten after the bug fixing sprint. All of the libraries listed below are suspect, although some may just be holding changes until after the release. [...]

flyweight [...] multi_index [...]

Hi Beman, sorry for the late response, been offline during the last week, and will go offline again in a day or so. Differences in flyweight and multi_index are concentrated in CMake-specific files, whose maintenance I'm not responsible for. Also, some of the differences, in my libs as well as many others, are related to the issue commented in this post: http://lists.boost.org/boost-cmake/2009/06/0592.php which unfortunately went unanswered. HTH, Joaquín M López Muñoz Telefónica, Investigación y Desarrollo