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

[Nicolas Alvarez]

Johannes Sixt wrote:
> Am 2/3/2011 13:04, schrieb Johannes Sixt:
>> Before anybody begins to work in this way, someone with sufficient
>> knowlege must introduce the first real merge of the 4.6 branch into the
>> master branch. The conflicts must be resolved; or it is possible to punt
>> by using -s ours.
>> 
>> As long as this merge did not happen, anyone who wants to use the merge
>> workflow is at a loss, unfortunately.
> 
> I tried to do the initial merges in kdelibs, kde-runtime, kde-baseapps,
> and kde-workspace yesterday, and they turned out to be rather simple with
> a surprisingly trivial result. Fast-forward to 5. below if you want to
> know what it is.
> 
> The simplicity results from two assumptions:
> 
> (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.

-- 
Nicolas