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

[Albert Astals Cid]

El Dijous, 17 de juliol de 2014, a les 13:08:42, Andreas Xavier va escriure:
> Albert,
> 
>   Here are some answers.
> 1.   https://bugs.kde.org/show_bug.cgi?id=246189 is a typo and is not a
> Parley bug.
> 
> 2.   https://bugs.kde.org/show_bug.cgi?id=246198 is fixed in 4.14. I
> compiled and double checked.
> 
> 3.  https://bugs.kde.org/show_bug.cgi?id=326429 was fixed in commit
> 
> 8a512c2639229cc58 on 4.13
> 
> It is in 4.13, but not in 4.14.  I suspect it was removed intentionally,
> since as bug 246198 shows the dirty status is not reliable enough to
> determine when not to autosave. I think you might have to check with Inge
> to be certain.

I'd say Inge just forgot to add it to 4.14 and master. Inge? 

> 
> 4.  For headerData there are 2 patches.  The functionality of the 2 patches
> is the same. I committed on 4.14 and cherry-picked the commit to 4.13.  I
> changed the enum FirstDataColumn  in 4.14 to the number 2 in 4.13, because
> the enum was defined in a larger patch that added new functionality.  The
> 4.13 patch could be reverted. It only fixes a crash on exit that I don't
> think can result in data loss.

No, that's fine if the code is correct and nothing was lost this is ok.

Cheers,
  Albert

> 
> The commit hashes are:
> 
> 4.14 -> a0ddc3b8df04cabadf01f3
> 
> 4.13 -> 13cd9a70b8fe2f51a3
> 
> 
> 
> Andreas
> 
> 
> 
> 
> ---- On Thu, 17 Jul 2014 11:47:51 -0700 Albert Astals Cid<aacid at kde.org>
> wrote ----
>  > 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