KDevelop 4.3 branch screwed again?

[Nicolás Alvarez]

2012/6/10 Milian Wolff <mail at milianw.de>:
> On Sunday 10 June 2012 17:39:25 Andreas Pakulat wrote:
>> Hi,
>>
>> On Sun, Jun 10, 2012 at 10:17 AM, Andreas Pakulat <apaku at gmx.de> wrote:
>> > Hi,
>> >
>> > On Sun, Jun 10, 2012 at 1:20 AM, Friedrich W. H. Kossebau <
>> >
>> > kossebau at kde.org> wrote:
>> >> Hi,
>> >>
>> >> after lot of month I tried to build the current 4.3 branch (on commit
>> >> 5c288e2014c043593f8c6385b2aefb221615a652) and I am hitting a build
>> >> problem in
>> >> kdevelop/languages/cpp/cpplanguagesupport.cpp (see attached log for full
>> >> output). Any idea what is wrong for me?
>> >>
>> >> Yes, deleted any 4.3 branch I had locally. But refetching did not improve
>> >> things.
>> >>
>> >> The looking at the stuff on the central repo like
>> >>
>> >> https://projects.kde.org/projects/extragear/kdevelop/kdevelop/repository/
>> >> revisions/4.3/entry/CMakeLists.txt I wonder about the KDEVELOP_VERSION,
>> >> does not look correct. The needed KDevPlatform version 1.3.60 also looks
>> >> strange.
>> >
>> > Can't look at this right now due to the identity.kde.org downtime, my
>> > local checkout from May 12th, however still shows a separate 4.3 head. So
>> > if there is a problem it was introduced only recently.
>>
>> Hmm, seems like someone did a reset at some point, I can see this in the
>> history:
>>
>> The last commit into the original 4.3 branch following the v4.3.1 tag
>> (which was still ok) is:
>> 6b95b832d72696df0278ac7b9d290c96b798ef07
>>
>> That follows a merge of 4.3, probably into master. And then next there are
>> a few scripty commits (1e692b9d495d9bfd3af54f2769d4c764e7e197d7 and
>> following) and then milian
>> comitted based on that last scripty commit again
>> (86f4848f9f6324540c0ca9c70dfd81ff0e6b1cfc) . There's been a few more
>> commits and ultimately this branch leads to the current 4.3 tip
>> (5c288e2014c043593f8c6385b2aefb221615a652).
>>
>> So I guess 4.3 needs to be reset
>> to 6b95b832d72696df0278ac7b9d290c96b798ef07 and then each of the following
>> commits on the wrong 4.3 branch need to be cherry-picked, except for the
>> scripty-ones (those will just be done again by scripty on its next run).
>>
>> I'm cc'ing milian explicitly to make him aware of this.
>
> Hey, thanks for the notification.
>
> Can anyone look into this? PovAddict?

This seems to be partly my fault. I'm still investigating what exactly
went wrong.

Fixing it looks tricky, because many commits were done on top of the
bad merge, and the 4.3 branch was merged into other branches. If I fix
only 4.3, many commits will be duplicated (once in the fixed 4.3
branch, and again in the non-fixed 4.3 as merged in the other
branches)...

-- 
Nicolás