Initial merge (was: Re: Merge or Cherry-Pick?)

[Nicolas Alvarez]

Thiago Macieira wrote:
> On Friday, 4 de February de 2011 15:18:58 Nicolas Alvarez wrote:
>> Johannes Sixt wrote:
>> > (1) All back- and forward-porting was complete when SVN went
>> > read-only.
>> 
>> IMHO this is not a safe assumption. As I said before, I found a missing
>> forward-port in kdeplasma-addons, which is a 'small' repository. I see a
>> higher chance of a missing forward port among the 200+ 4.6 revisions in
>> kdelibs.
> 
> Those missing forward-ports need to be forward-ported anyway. The merging
> doesn't change that.
> 
> Whoever forgot to do forward-ports should be doing it *yesterday*.

I know forward-ports should be done anyway and asap. But until they aren't 
done, we can't do the 4.6 merge.

-- 
Nicolas