[IMPORTANT] Change in branch handling in emerge

[Patrick Spendrin]

Am 12.02.2013 09:39, schrieb Andre Heinecke:
> Hi,
> 
> At Monday 11 February 2013 14:15:14 Patrick Spendrin wrote:
>> Hi everybody,
>>
>> because we decided to base the 4.10 branch on master rather than on the
>> 4.9 branch, I also decided to change the policy on forward porting commits:
>>
>> For kde-4.8 and kde-4.9 commits must be cherry-picked.
>> For kde-4.10 and all upcoming releases, commits must go into the latest
>> branch they apply to, and then must be merged into all branches( you
>> need this fix in).
> First, let me say that i think a policy for this is a good thing. But I am a 
> bit unsure of how you imagine this workflow to look like. When you say merged 
> into all branches you mean cherry picking?

No, I mean merging.
At the moment we have these branches:
4.[7-9]
4.10
master
qt5

4.[7-9] cannot be merged anywhere, for these branches the workflow needs
to stay as it is: cherry-picking if possible.
the other branches can be merged, this means my patches are committed in
4.10 and then merged into master and qt5.

> I don't see how it would be possible to merge 4.10 to master because all the 
> commits that change the default targets etc. would also be merged to master 
> (and we don't want that) and i doubt i could merge 4.10 with 4.9.
> 
> Or should we no longer change the default target in the branches, this would 
> make a real forward merge workflow possible.

default target changes for kde packages aren't needed anymore because I
added a way to set the targets and the branch in one file for all KDE
packages in master and kde-4.10.

> 
> Can you give an example workflow for a patch that you want to apply in the 4.9 
> 4.10 and master branches and apply it to the targets for 4.9 4.10 and master?

You need to apply this in 4.9 and in 4.10, then merge 4.10 to master. In
the case the patch applies to both 4.9 and 4.10, you could first apply
the patch in 4.10, then cherry-pick this to 4.9, otherwise you will have
to apply the patch in both branches.

Merging from 4.10 to master is possible nowadays.

> 
> Regards,
> Andre
> 

I hope this makes it clear for everybody.

regards,
Patrick