JQuery 1.6.1 branch merged

[Antranig Basman]

On 15/05/2011 08:37, Michelle D'Souza wrote:
>
>
> On 2011-05-13, at 7:43 PM, Antranig Basman wrote:
>>
>>
>> In news which I know will upset a FISH, I seem to have sadly managed to "flip the line" again with this merge,
>
> Fish are not so easily upset as that.  :)
>
>>
>> git merge --log harriswong/FLUID-4113
>>
>
>
> I believe that if you'd used the --no-ff flag then the line would have stayed the same.

I think that wouldn't have worked this time... that prevents a fast-forward if one is going to occur, but 
since this was a genuine branch merge there is no way it could have been resolved with an FF in any case. I 
just made a manful attempt to flip the black line back again by creating a spurious branch from the past, 
but it didn't work since I couldn't create an FF for the "out-of-time" update since there had already been a 
merge in the way... I think we are stuck with the "black line flipped" for all time now, and with Colin's 
commit just now our "synchronous history" has already receded yet one further step back, becoming green 
rather than blue :P
Also browsing our recent history with gitk shows a graph that appears utterly unrelated in topology to the 
one displayed by github... I think we will have to sadly accept that the choosing in priority of merge 
parents when doing layout is essentially arbitrary as we feared :(

Sorry :(

Boz

> It's exciting to have the jquery upgrade in the project repo now - thanks everyone!
>
> Michelle
>
>
>
>