Many libraries have unmerged changes in their develop branches. Some of those are legitimate, many aren't. What follows is a list of the submodules for which git log master..develop reports something, created by git submodule foreach "git log -n 1 --oneline origin/master..origin/develop || :" and then edited slightly by me. Entering 'libs/accumulators' 2bf02f3 Merge pull request #2 from danieljames/metadata Entering 'libs/algorithm' d473435 Added more general power functionality as requested by Sean Parent. Also added enable_if to make sure the exponent is an integral type. Entering 'libs/array' 0d4fa27 Merge pull request #3 from boostorg/pull_request/remove_hash_fwd Entering 'libs/atomic' 427a757 Merge pull request #4 from jhunold/test_dependency Entering 'libs/bimap' dd4e612 Correct broken links to C++ standard papers. Refs #9212. Entering 'libs/chrono' d7478b9 move from math to integer for gcd(). Entering 'libs/concept_check' bb9257a Remove executable status from a bunch of source files Entering 'libs/config' 06aa40a Remove requirement that BOOST_MSVC_ENABLE_2014_JUN_CTP be defined to get the correct BOOST_NO_CXX11_* macros for VC++ 14.0 (aka 2015). Entering 'libs/container' 6932417 Support types with std::allocator_arg_at with boost::container::scoped_allocator_adaptor Entering 'libs/context' ac1b845 usei consistent use of BOOST_ASSERT Entering 'libs/conversion' 84ab592 Merge pull request #7 from Boris-Rasin/synopsis Entering 'libs/convert' f066fac turning std=c++11 on Entering 'libs/core' 2beeb73 Fixed a typo in the comment. Entering 'libs/coroutine' 9814084 remove feature segmented stack (already defined in boost.context) Entering 'libs/crc' 3de6617 Merge pull request #1 from danieljames/metadata Entering 'libs/date_time' ca30f6a Documentation patch from 'faithandbrave' Entering 'libs/detail' fcaf168 Initial commit if lightweight_test_report.hpp, aimed at making it easier for users to supply sample programs in bug reports. First use will be in filesystem. Entering 'libs/dynamic_bitset' 225064d Patch by Riccardo Marcangelo: Added a pop_back() member function which decreases the size of the bitset by one Entering 'libs/endian' 810f545 Work-in-progress, including various bug fixes and doc updates. Entering 'libs/exception' c1f6b74 Merge pull request #5 from danieljames/metadata Entering 'libs/filesystem' 96d5cdd Remove test_folder. Content is now in branch test-files/utf-8, so that master and develop conform to Boost file naming policy. Entering 'libs/foreach' 3bc8f66 Merge pull request #2 from danieljames/metadata Entering 'libs/format' 5826c68 Fix typo. Patch from kylelutz Entering 'libs/function' 157aaea Merge pull request #4 from apolukhin/rvalue_params Entering 'libs/function_types' caed0a6 Correct broken links to C++ standard papers. Refs #9212. Entering 'libs/functional' a478186 Fix version number in release notes. Entering 'libs/fusion' af1bc25 - disabling test for now (todo later) - removing irrelevant tuple test Entering 'libs/geometry' 9b6be5f [point] assign values differently such that: no warning is given, and explicit can be used for one constructor only Entering 'libs/gil' 1618df0 Merge pull request #12 from danieljames/metadata Entering 'libs/graph' 2573fbb Fix warning on const return by value. Entering 'libs/graph_parallel' 17214e8 Merge pull request #6 from michaelopitz/develop Entering 'libs/io' b3e349c Merge pull request #1 from danieljames/metadata Entering 'libs/iostreams' d702307 Correct broken links to C++ standard papers. Refs #9212. Entering 'libs/iterator' ec7d398 Merge pull request #10 from Flast/pr/ref-to-ref/dr106 Entering 'libs/lambda' 545b6af Merge pull request #1 from jzmaddock/patch-2 Entering 'libs/lockfree' 39cc67a lockfree: spsc_queue compile fix Entering 'libs/logic' b3adfec Merge pull request #2 from apolukhin/develop Entering 'libs/math' 9561623 [Beta/Gamma]Fix concept failures caused by previous commit. Entering 'libs/mpi' b4e8640 Enable new test now that missing source has been added. Entering 'libs/mpl' 6a0f617 Revert "Merge pull request #11 from Lastique/modularization" Entering 'libs/multi_array' 5578fc3 Merge pull request #6 from MarcelRaad/patch-1 Entering 'libs/numeric/conversion' c90517d Merge pull request #3 from danieljames/metadata Entering 'libs/numeric/interval' 538299d Apply https://github.com/boostorg/interval/pull/1 manually; qualify four calls to 'to_int' with 'this->' Entering 'libs/numeric/odeint' d69cba8 Merge pull request #5 from danieljames/metadata Entering 'libs/numeric/ublas' 12f6c6c Merge pull request #16 from danieljames/develop Entering 'libs/optional' a8a6be0 More tests migrated to core/minimal_test Entering 'libs/parameter' 54854d4 Correct broken links to C++ standard papers. Refs #9212. Entering 'libs/phoenix' e168b28 Updated preprocessed files Entering 'libs/predef' 84967e3 Add missing BOOST_PREDEF_MAKE_0X_VVRRPP macro (thanks ro Erik Lindahl for finding it). Entering 'libs/preprocessor' fd135a0 Added BOOST_PP_LIST_SIZE_D to list of re-entrant macros. Entering 'libs/program_options' 0c01e9a Add testing for implicit_values and non-consuming of separate tokens. Entering 'libs/property_map' ba0bed2 Merge pull request #2 from danieljames/metadata Entering 'libs/property_tree' 24125b4 Merge pull request #6 from danieljames/metadata Entering 'libs/proto' 8566061 get lambda example compiling on clang Entering 'libs/ptr_container' 9ed3379 Merge pull request #1 from BenPope/develop Entering 'libs/python' 6b7e0cc Remove all references to now defunct (and removed) header. Entering 'libs/random' a8aed49 Use the right upper bound for the exponent. Entering 'libs/range' 4f3bdbe Merge pull request #24 from steveire/remove-algorithm-dep Entering 'libs/ratio' 591a1e6 Merge pull request #2 from danieljames/fix-json Entering 'libs/regex' 39aa10d Fix for: https://github.com/boostorg/regex/pull/9 Entering 'libs/serialization' 594541b Merge pull request #4 from danieljames/metadata Entering 'libs/signals' 7dc7b47 Merge pull request #4 from danieljames/metadata Entering 'libs/smart_ptr' f65c57d Fix explicit instantiation regression Entering 'libs/spirit' f51566b Merge pull request #75 from mloskot/develop Entering 'libs/statechart' c9cf783 Merge pull request #1 from apolukhin/develop Entering 'libs/static_assert' bb3cc11 Merge pull request #2 from mgaunard/clang_warning_fix Entering 'libs/test' bf1c122 Now just "using" Entering 'libs/thread' 2c028aa fix more erros after Boost.Test commit. Entering 'libs/throw_exception' a9de81a Merge branch 'master' into develop Entering 'libs/timer' f4ec9cc Merge pull request #1 from danieljames/metadata Entering 'libs/tokenizer' 2fa9f44 Merge pull request #4 from Lastique/patch-1 Entering 'libs/tr1' 9f28b87 Merge pull request #2 from danieljames/metadata Entering 'libs/tti' 7b13a81 Merge pull request #1 from danieljames/metadata Entering 'libs/tuple' b54dd80 Merge pull request #6 from K-ballo/boostbook Entering 'libs/type_erasure' e92682a VC12's variadic templates have some bugs. Fall back on the PP implementation for some components. Entering 'libs/type_index' 8558fd6 remove the always failing testing_crossmodule_anonymous_no_rtti test from test suite and add notes for users about emulation limitations testing Entering 'libs/typeof' 4e34737 TypeOf: Fix if/elif chain after msvc 6/7 removal. Entering 'libs/unordered' 68eb654 Merge pull request #4 from tempoz/patch-2 Entering 'libs/uuid' d233193 Fixed compilation. Entering 'libs/variant' e00c75c Continue fixes, pointed out by Adam Wulkiewicz: removed unnecessary reference_content.hpp include, added missing static_assert.hpp include Entering 'libs/wave' bb0adbf Merge pull request #2 from danieljames/metadata Entering 'libs/xpressive' 7377713 Merge pull request #3 from danieljames/metadata Entering 'tools/build' f5b31b3 Block signals to end of exec_cmd. Entering 'tools/quickbook' b93c2a7 Use quickbook 1.7 for documentation.
El 15/01/2015 a las 20:59, Peter Dimov escribió:
Entering 'libs/container' 6932417 Support types with std::allocator_arg_at with boost::container::scoped_allocator_adaptor
At least my local git shows that commit is tagged as origin/master and origin/develop. Best, Ion
Ion Gaztañaga wrote:
El 15/01/2015 a las 20:59, Peter Dimov escribió:
Entering 'libs/container' 6932417 Support types with std::allocator_arg_at with boost::container::scoped_allocator_adaptor
At least my local git shows that commit is tagged as origin/master and origin/develop.
It does now for me as well, after I did "git fetch". I thought that origin/master would work and reference whatever is on origin, even without fetching, but apparently not. You might consider merging with --no-ff, to retain the merge commits, although that's a matter of taste, I suppose.
On Thursday 15 January 2015 21:59:01 Peter Dimov wrote:
Many libraries have unmerged changes in their develop branches. Some of those are legitimate, many aren't.
What follows is a list of the submodules for which git log master..develop reports something, created by
git submodule foreach "git log -n 1 --oneline origin/master..origin/develop
|| :"
and then edited slightly by me.
Entering 'libs/atomic' 427a757 Merge pull request #4 from jhunold/test_dependency
This was committed just yesterday. Now that Boost.Test has been reverted this change has no effect.
Entering 'libs/mpl' 6a0f617 Revert "Merge pull request #11 from Lastique/modularization"
This doesn't make sense. The difference is just in meta/libraries.json, which is only present in develop but not in master.
Andrey Semashev wrote:
Entering 'libs/mpl' 6a0f617 Revert "Merge pull request #11 from Lastique/modularization"
This doesn't make sense. The difference is just in meta/libraries.json, which is only present in develop but not in master.
There's one more difference: C:\Projects\boost-git\boost\libs\mpl>git diff --name-status master..develop M include/boost/mpl/has_xxx.hpp A meta/libraries.json "git log master..develop" reports a long list of commits though, which means that it doesn't think that develop has been merged to master (at least recently). I'm not sure why or how this can happen if it has, in fact, been merged.
On Thursday 15 January 2015 23:16:29 Peter Dimov wrote:
Andrey Semashev wrote:
Entering 'libs/mpl'
6a0f617 Revert "Merge pull request #11 from Lastique/modularization"
This doesn't make sense. The difference is just in meta/libraries.json, which is only present in develop but not in master.
There's one more difference:
C:\Projects\boost-git\boost\libs\mpl>git diff --name-status master..develop M include/boost/mpl/has_xxx.hpp A meta/libraries.json
git diff master
diff --git a/meta/libraries.json b/meta/libraries.json
new file mode 100644
index 0000000..6f7bd4c
--- /dev/null
+++ b/meta/libraries.json
@@ -0,0 +1,14 @@
+{
+ "key": "mpl",
+ "name": "MPL",
+ "authors": [
+ "Aleksey Gurtovoy"
+ ],
+ "description": "The Boost.MPL library is a general-purpose, high-level
C++ template metaprogramming framework of compile-time algorithms, sequences
and metafunctions. It provides a conceptual foundation and an extensive set of
powerful and coherent tools that make doing explict metaprogramming in C++ as
easy and enjoyable as possible within the current language.",
+ "category": [
+ "Metaprogramming"
+ ],
+ "maintainers": [
+ "Aleksey Gurtovoy
"git log master..develop" reports a long list of commits though, which means that it doesn't think that develop has been merged to master (at least recently). I'm not sure why or how this can happen if it has, in fact, been merged.
It was not merged. The MPL.Core PR was merged to develop and then reverted, basically making it unchanged. But commits are still there.
participants (3)
-
Andrey Semashev -
Ion Gaztañaga -
Peter Dimov