[Kde-pim] kdepimlibs 4.12 versioning problem

[Ben Cooksley]

On Wed, Dec 11, 2013 at 1:59 AM, Daniel Vrátil <dvratil at redhat.com> wrote:

>
> On Tuesday 10 of December 2013 19:52:16 Ben Cooksley wrote:
> > Hi everyone,
> >
>
> Hi,
>
> > It would appear that the CMakeLists.txt in kdepimlibs for KDE/4.12
> > currently has it's version set to 4.12.43, which is totally wrong.
> >
> > More concerningly, it means master has been merged into KDE/4.12 at some
> > point.
> > My checks reveal the commit in question which did this is
> > probably ca3a3857b5ab80497b3318659a7b07bb21560ede.
> >
> > Can someone please verify this is the case?
>
> yes, the merge had a conflict in root CMakeLists.txt, probably due to the
> versions.
>
> > If it is the case, what action do we need to take? Should we force rewind
> > it back to the last good commit -
> b299b86fb5e0a7f57d5828297703b9aa676ca5f9
> > and cherry pick the needed patches? Or just patch up the version number
> and
> > any other issues it has?
>
> gitk shows some mess (commits from 2006-2013 on top of the commit list),
> so I
> think it would be better to rewind back to the last good commit and cherry
> pick the good commits from master. From my kde-commits ML folder (which I
> don't guarantee is complete on my side, but should be) it looks like there
> were following commits done into 4.12 after the bad merge:
>
> 2d2045de8b6d7e859c18e00be7afa05fdb077381
> 8089df4bf309f56e17c94e4d3bfe8b8e905e9895
> b8e0f33bb3e17d3b24fcd05827243a9f9feec244
>

Based on the lack of objections to Dan's proposal, I have now force pushed
kdepimlibs branch KDE/4.12, reverting it back to the last known good commit.


>
>
> Dan
>

Thanks,
Ben


>
> >
> > Thanks,
> > Ben
> > _______________________________________________
> > KDE PIM mailing list kde-pim at kde.org
> > https://mail.kde.org/mailman/listinfo/kde-pim
> > KDE PIM home page at http://pim.kde.org/
>
> --
> Daniel Vrátil
> KDE Desktop Team
> Associate Software Engineer, Red Hat, Inc.
>
> GPG Key: 0xC59D614F6F4AE348
> Fingerprint: 4EC1 86E3 C54E 0B39 5FDD B5FB C59D 614F 6F4A E348
> _______________________________________________
> KDE PIM mailing list kde-pim at kde.org
> https://mail.kde.org/mailman/listinfo/kde-pim
> KDE PIM home page at http://pim.kde.org/
>
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/