Re: [AD] OSX fixes

I'll chalk that one up to experience ... git always seems to find a new way to surprise.

Basically I had the code working *for me* using the 64-bit compiler v7, then Travis told me I'd used some features that weren't in the v6 compiler, then Trent told me I'd used some features that weren't in the 32-bit runtime.

So the history looks like some substantial changes followed by a series of one-liners which ideally I would have squashed using interactive rebase. However, as I understand it, it's not good to rebase code that's been pushed already (?)

Anyway it should be good now until someone else finds a bug!

Pete

On Sun, 22 Nov 2015 at 03:54 Elias Pschernig <elias@xxxxxxxxxx> wrote:

On Sat, Nov 21, 2015 at 9:53 PM, Trent Gamblin <trent@xxxxxxxxxx> wrote:
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 actually did not test 64 bit so hopefully that’s tested and working also.

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 :)

_______________________________________________
Allegro-developers mailing list
Allegro-developers@xxxxxxxxxx
https://mail.gna.org/listinfo/allegro-developers