[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-release-team
Subject: Re: [Kde-pim] kdepimlibs 4.12 versioning problem
From: Ben Cooksley <bcooksley () kde ! org>
Date: 2013-12-11 8:35:40
Message-ID: CA+XidOG5BWZf65kc2mVyRsL2AF-2V5E_EZOJi24HgeekkeBfww () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
On Wed, Dec 11, 2013 at 1:59 AM, Daniel Vr=E1til <dvratil@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 som=
e
> > 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 rewi=
nd
> > 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 cherr=
y
> 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 ther=
e
> 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@kde.org
> > https://mail.kde.org/mailman/listinfo/kde-pim
> > KDE PIM home page at http://pim.kde.org/
>
> --
> Daniel Vr=E1til
> 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@kde.org
> https://mail.kde.org/mailman/listinfo/kde-pim
> KDE PIM home page at http://pim.kde.org/
>
[Attachment #5 (text/html)]
<div dir="ltr">On Wed, Dec 11, 2013 at 1:59 AM, Daniel Vrátil <span dir="ltr"><<a \
href="mailto:dvratil@redhat.com" target="_blank">dvratil@redhat.com</a>></span> \
wrote:<br><div class="gmail_extra"><div class="gmail_quote"> <blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"><br> On Tuesday 10 of December 2013 19:52:16 Ben Cooksley \
wrote:<br> > Hi everyone,<br>
><br>
<br>
Hi,<br>
<div class="im"><br>
> It would appear that the CMakeLists.txt in kdepimlibs for KDE/4.12<br>
> currently has it's version set to 4.12.43, which is totally wrong.<br>
><br>
> More concerningly, it means master has been merged into KDE/4.12 at some<br>
> point.<br>
> My checks reveal the commit in question which did this is<br>
> probably ca3a3857b5ab80497b3318659a7b07bb21560ede.<br>
><br>
> Can someone please verify this is the case?<br>
<br>
</div>yes, the merge had a conflict in root CMakeLists.txt, probably due to the<br>
versions.<br>
<div class="im"><br>
> If it is the case, what action do we need to take? Should we force rewind<br>
> it back to the last good commit - b299b86fb5e0a7f57d5828297703b9aa676ca5f9<br>
> and cherry pick the needed patches? Or just patch up the version number and<br>
> any other issues it has?<br>
<br>
</div>gitk shows some mess (commits from 2006-2013 on top of the commit list), so \
I<br> think it would be better to rewind back to the last good commit and cherry<br>
pick the good commits from master. From my kde-commits ML folder (which I<br>
don't guarantee is complete on my side, but should be) it looks like there<br>
were following commits done into 4.12 after the bad merge:<br>
<br>
2d2045de8b6d7e859c18e00be7afa05fdb077381<br>
8089df4bf309f56e17c94e4d3bfe8b8e905e9895<br>
b8e0f33bb3e17d3b24fcd05827243a9f9feec244<br></blockquote><div><br></div><div \
style>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.</div> \
<div style> </div><blockquote class="gmail_quote" style="margin:0 0 0 \
.8ex;border-left:1px #ccc solid;padding-left:1ex"> <br>
<br>
Dan<br></blockquote><div><br></div><div style>Thanks,</div><div style>Ben</div><div \
style> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px \
#ccc solid;padding-left:1ex"> <br>
><br>
> Thanks,<br>
> Ben<br>
> _______________________________________________<br>
> KDE PIM mailing list <a href="mailto:kde-pim@kde.org">kde-pim@kde.org</a><br>
> <a href="https://mail.kde.org/mailman/listinfo/kde-pim" \
target="_blank">https://mail.kde.org/mailman/listinfo/kde-pim</a><br> > KDE PIM \
home page at <a href="http://pim.kde.org/" \
target="_blank">http://pim.kde.org/</a><br> <span class="HOEnZb"><font \
color="#888888"><br>
--<br>
Daniel Vrátil<br>
KDE Desktop Team<br>
Associate Software Engineer, Red Hat, Inc.<br>
<br>
GPG Key: 0xC59D614F6F4AE348<br>
Fingerprint: 4EC1 86E3 C54E 0B39 5FDD B5FB C59D 614F 6F4A \
E348</font></span><br>_______________________________________________<br> KDE PIM \
mailing list <a href="mailto:kde-pim@kde.org">kde-pim@kde.org</a><br> <a \
href="https://mail.kde.org/mailman/listinfo/kde-pim" \
target="_blank">https://mail.kde.org/mailman/listinfo/kde-pim</a><br> KDE PIM home \
page at <a href="http://pim.kde.org/" \
target="_blank">http://pim.kde.org/</a><br></blockquote></div><br></div></div>
_______________________________________________
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic