[IMPORTANT] Change in branch handling in emerge

[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?
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.

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?

Regards,
Andre

-- 
Andre Heinecke |  ++49-541-335083-262 |  http://www.intevation.de/
Intevation GmbH, Neuer Graben 17, 49074 Osnabrück | AG Osnabrück, HR B 18998
Geschäftsführer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner