Re: [boost] [git] The any library does not pull cleanly because of a forced update on develop and master.

Subject: Re: [boost] [git] The any library does not pull cleanly because of a forced update on develop and master.
From: Daniel James (daniel_at_[hidden])
Date: 2013-12-12 07:05:37

On 12 December 2013 11:08, Ahmed Charles <acharles_at_[hidden]> wrote:
>
>> From: daniel_at_[hidden]
>>
>> We have to rewrite history because of this:
>>
>> http://lists.boost.org/Archives/boost/2013/08/205491.php
>>
>> It's a bit late to change plans now.
>
> odeint and predef can both be solved with merging the 'original history' with the 'svn history' and you effectively get both. That's an accurate representation of what will actually happen.

We've said they could use their own repo. They shouldn't have to
incorporate the subversion history as that will muddy their history,
and for what gain? The history in the supermodule will be accurately
represented by the submodule reference jumping from one branch to
another.

Whichever way, the decision was made, and no one opposed the plan. If
we'd followed my suggestion then there would be no need for a forced
push, but no one agreed with me, so I dropped it.