I tested Peter Hull’s latest fix. Since it works, it should be OK to just merge into 5.1.
On Sat, Nov 21, 2015 at 9:56 PM, Trent Gamblin <trent@xxxxxxxxxx> wrote:
I merged the branch (just those 2 commits) now. The picture below is what happened:
Pink line is Peter's branch with all the commits in the pull request.
Yellow+dark red is how things should have gone, with all those commits made without the commits from the pull request having been applied.
Grey line is the alternate reality I created, where the pull request (except newest 2 commits) was applied before all those other commits, with those commits on top.
Bright red then aptly colored is the time where I added extra commits on top of the accidental merge without realizing.
Anyway, current 5.1 has all commits from all branches and, pending the final testing of the pull request, everything should be back to normal. Sorry about the confusion, I'll try and be more careful next time :)