Re: [boost] Unmerged changes in develop

Subject: Re: [boost] Unmerged changes in develop
From: Andrey Semashev (andrey.semashev_at_[hidden])
Date: 2015-01-15 17:11:04

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 <agurtovoy -at- meta-comm.com>"
+    ]
+}

That's all difference I can see. I did pull & merge both branches immediately 
before diff.

> "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.