JQuery 1.6.1 branch merged

Justin Obara obara.justin at gmail.com
Mon May 16 13:51:32 UTC 2011


Hello all, so just because it's fun to talk about flipped graphs, I'd thought I through my 2 cents in :)

Antranig, I think you should have been able to use the --no-ff flag. If I'm not mistaken all that says is to ensure that a merge commit occurs. If you don't use that flag a fast-forward may occur. I believe a fast-forward is just something that git does to progress the current branch forward to that of the merged branch, and has the effect of flipping the graph in some cases. 

I've spent a bit of time playing with it this morning to see if I could fix it at all. What I have so far done was to reset master back to before the merge occurred. Did a merge with the --no-ff flag. After this since there were a few commits, I just merged the existing upstream/master back into it.   I'm not sure if I'll be able to get it any cleaner than this and preserve all of the commit numbers as they are.  

Currently this is displayed in two branches in the graph below.

https://github.com/jobara/infusion_network_graph/network

I'm not entirely sure it's worth trying to fix, but we may want to, since there has been a number of commits since that branch had started. Let me know what you all think. 

Thanks
Justin


On 2011-05-16, at 3:56 AM, Antranig Basman wrote:

> 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
>> 
>> 
>> 
>> 
> 
> _______________________________________________________
> fluid-work mailing list - fluid-work at fluidproject.org
> To unsubscribe, change settings or access archives,
> see http://fluidproject.org/mailman/listinfo/fluid-work




More information about the fluid-work mailing list