Subject: Re: [boost] [EXTERNAL] [graph] Sync develop with master?
From: Belcourt, Kenneth (kbelco_at_[hidden])
Date: 2016-06-28 13:32:24
> On Jun 28, 2016, at 3:31 AM, Murray Cumming <murrayc_at_[hidden]> wrote:
> On Mo, 2016-05-30 at 19:43 +0000, Belcourt, Kenneth wrote:
>> On May 30, 2016, at 3:37 AM, Murray Cumming <murrayc_at_[hidden]>
>>> Now that Boost 1.61 is out, it would be great if the various fixes
>>> boost graph's develop branch could be merged/cherry-picked/whatever
>>> master, please. There seem to be a couple of years of fixes that
>>> not appeared in a release.
>> Thanks for the reminder.
> To help, I tried doing a simple
> git merge --no-ff develop
> from the master branch. I think that's what boost's git workflow
> dictates. Here is the result:
> There was only one tiny whitespace conflict that I had to correct
> Unfortunately, it has a big "merge" commit, which I find messy, but
> maybe that's normal with this workflow:
> I've tried to create a github pull request for this merge to master, in
> case that's helpful:
Thanks, Iâd prefer to cherry-pick the individual commits so I can test them against master. The recent changes to the testing infrastructure has slowed this down as itâs now less-convenient to test that it was previously.
Appreciate the ping.