Re: [boost] Unmerged changes in develop

Subject: Re: [boost] Unmerged changes in develop
From: Peter Dimov (lists_at_[hidden])
Date: 2015-01-15 16:16:29

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.