Re: [Cake] Cake tree unreadable

2017-11-29 Thread Dave Taht
Sebastian Moeller writes: > Hi All, > > >> On Nov 28, 2017, at 23:37, Dave Taht wrote: >> >> >> A flag day here is feasible. I will fiddle along the lines you describe. >> >> As for other flag days... >> >> I'm toying with the idea of fixing xstats in a separate branch. I really >> hate the

Re: [Cake] Cake tree unreadable

2017-11-29 Thread Sebastian Moeller
Hi All, > On Nov 28, 2017, at 23:37, Dave Taht wrote: > > > A flag day here is feasible. I will fiddle along the lines you describe. > > As for other flag days... > > I'm toying with the idea of fixing xstats in a separate branch. I really > hate the idea of breaking backward compatability h

Re: [Cake] Cake tree unreadable

2017-11-29 Thread Toke Høiland-Jørgensen
Dave Taht writes: > A flag day here is feasible. I will fiddle along the lines you > describe. FWIW I don't think the history is that bad. Sure, there are a bunch of merge commits, but picking out the real ones is not that difficult (unless you are using the github web interface, I guess, but th

Re: [Cake] Cake tree unreadable

2017-11-28 Thread Dave Taht
A flag day here is feasible. I will fiddle along the lines you describe. As for other flag days... I'm toying with the idea of fixing xstats in a separate branch. I really hate the idea of breaking backward compatability here, but I do suspect it will be a barrier to upstreaming, and it is, quit

Re: [Cake] Cake tree unreadable

2017-11-28 Thread Kevin Darbyshire-Bryant
> On 28 Nov 2017, at 18:48, Dave Taht wrote: > > > > It sounds like your git-foo is stronger than ours! I'm not even trying > to get head to work, tho my intent would be to promote cobalt to it. git checkout master git pull (does the equivalent of git fetch origin; git merge origin/master)

Re: [Cake] Cake tree unreadable

2017-11-28 Thread Dave Taht
Kevin Darbyshire-Bryant writes: > In the nicest possible way… what on earth is going on with the cake source > tree > of late? Many ‘cascaded’ merges make things impossible to read and stuff > appears to be getting lost as well. e.g. the recent change "Switch ingress > failsafe to 2/3 instead

[Cake] Cake tree unreadable

2017-11-28 Thread Kevin Darbyshire-Bryant
In the nicest possible way… what on earth is going on with the cake source tree of late? Many ‘cascaded’ merges make things impossible to read and stuff appears to be getting lost as well. e.g. the recent change "Switch ingress failsafe to 2/3 instead of 1/4 bandwidth.” has now appeared twice,