Re: [boost] A few more critical dependencies

Subject: Re: [boost] A few more critical dependencies
From: Daniel James (dnljms_at_[hidden])
Date: 2014-06-06 04:38:03

On 6 June 2014 00:42, Daniel James <dnljms_at_[hidden]> wrote:
> On 5 June 2014 17:01, Peter Dimov <lists_at_[hidden]> wrote:
>>
>> Most of the history of this file is from the SVN and the transition doesn't
>> preserve any merge points, so the two branches appear completely separate,
>> even though the commits turn out to be actually identical in this case.
>
> That's because 'git log' includes the commits from both branches when
> they're merged.

I think a better way to do this is to create a copy of the repo, use
'git filter-branch' to reduce the history to the files you want, then
fetch the appropriate branches into the destination, and merge the
branch into your tree. There's an example of using 'git filter-branch'
at http://stackoverflow.com/a/6006679/2434.