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

[Albert Astals Cid]

El Dijous, 17 de juliol de 2014, a les 09:48:57, Andreas Xavier va escriure:
> Albert,

Hi

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

You're contributing, you're the right person to help ;)

> 
> However, I may be the one who broke things.

No worries.

> 
> 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?

Have a look at this diff.

Seems the autoSave thing got lost

And StatisticsModel::headerData has a different implementation.

Comments on that?

Cheers,
  Albert



> 
> 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Q
Type: text/x-patch
Size: 3352 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/parley-devel/attachments/20140717/dba4811d/attachment.diff>