[Parley-devel] Does 4.14 contain all the code it should?

[Andreas Xavier]

Albert,
I only started here a week before the 4.14 feature freeze so I may not be the right person to help you.

However, I may be the one who broke things.

Last week I committed a patch fixing a crash to 4.14.  I then merged the patch into
master.  And then I cherry-picked from there onto 4.13.  I changed an enum 
back to a number to avoid pulling in a new feature patch.  

The commit in 4.13 is 13cd9a70b8fe2f51a3.
The corresponding commit in 4.14 and master is a0ddc3b8df04c

The patch is corner case crash and I can easily remove it from 4.13.

What do want me to do?

Andreas   

---- On Wed, 16 Jul 2014 15:57:36 -0700 Albert Astals Cid  wrote ---- 

>Hi guys, i tried merging 4.13 into 4.14 to make sure that all the code that 
>was in 4.13 is in 4.14 but i got a huge conflict (i guess you don't like 
>merging (you should makes things like this very easy)) so i can't be sure 4.14 
>contains everything that was in 4.13 too. 
> 
>Can anyone confirm that 4.14 indeed contains everything it should? 
> 
>Cheers, 
> Albert 
>