[cmake-developers] cmake automoc breaks kde

David Cole david.cole at kitware.com
Thu Dec 1 15:52:57 EST 2011


On Thu, Dec 1, 2011 at 3:29 PM, Alexander Neundorf <neundorf at kde.org> wrote:
> On Thursday 01 December 2011, David Cole wrote:
> ...
>> You have two topics on the stage with common parent commits:
>> AutomocIncludedDotMocFileHandling (not presently in next) and
>> RestoreAutmocKDECompatibility (which is presently in next)...
>>
>> Are you planning to keep both of these, or are you focused on the
>> continuing topic AutomocIncludedDotMocFileHandling with the intention
>> of removing RestoreAutmocKDECompatibility from the stage...?
>
> I'll remove the RestoreAutmocKDECompatibility branch tomorrow,
> AutomocIncludedDotMocFileHandling should contain everything (I got a bit
> confused with the branches two weeks ago).
> Is that ok or will that create problems with merging etc ?

That's ok. Just keep the one you want, and remove the other one from
the stage. We'll make sure things are good for merging to next/master
based on the one that you keep.


>
>> Also, could you remove TI_DSP_Compiler from the stage, and use some
>> other mechanism (github, gitorious, ...) to communicate changes with
>> the guy on the other side of that branch? The topic stage should
>> really only be used for things that are intended for 'next' in the
>> near future. Brad and I don't want to get in the habit of ignoring old
>> topic branches week after week when we review stuff on the stage.
>
> Hmm, ok.
>
> Alex


Thanks



More information about the cmake-developers mailing list