reflecting on 4.10

Marco Martin notmart at gmail.com
Sat Jan 12 16:38:03 UTC 2013


On Saturday 12 January 2013, Aaron J. Seigo wrote:
> * when branches are merged into master (because they've passed whatever
> testing set out as required) i send an email to the list noting what has
> been merged into master and what is still being merged into integration
> 
> as we don't have force pushes available to us, i have to occassionally
> delete the integration branch and re-branch it from master. this is fine,
> though, as no work is ever done directly in this branch. it's just a merge
> target.

yep, it works well on plasma-mobile (and yeah, needs *one* person,first weeks 
of it we tried it done by more than one person and uuuh, nope ;))

wonder how much scales for something as big as the kde-workspace repo...
coulb be person a responsible of what's in directory b, person c for what is 
in directory c? (being kwin, plsma, kcms...)

it would probably work usually...
but break as soon as the branch has to be recreated, tough some ease of 
scaling up could be needed.

also, for maintaining integration merged.. woder if there could be a bit of 
automation ivolved? (like on mondays a script deletes integration, recreates 
and merges branches listed in a text file somewhere, then human intervention 
is needed in case of conflicts)


-- 
Marco Martin


More information about the Plasma-devel mailing list