[IMPORTANT] Change in branch handling in emerge

Andre Heinecke aheinecke at intevation.de
Tue Feb 12 09:07:38 UTC 2013


Hi,

At Tuesday 12 February 2013 10:02:02 Patrick Spendrin wrote:
> 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.
Ah ok, missed that.
>
> > 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.
Nice, in that case this workflow should work in the same way it does for other 
parts of KDE.

I'm happy with it.

Thanks,
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


More information about the Kde-windows mailing list