[Kde-scm-interest] KDE PIM branches workflow with git

[Johannes Sixt]

Stephen Kelly schrieb:
> So that's forward porting. There will also inevitably be a need for
> backporting into the enterprise branches. Currently Allen and Thomas
> backport
> fixes in trunk or stable mostly as they see fit and without machine
> readable
> tracking.

Don't do that. Never back-port.

When you fix a bug, do so by making a branch at the "earliest" branch that
*could* benefit from the fix; ideally, you branch off the commit that
introduced the bug. Then forward-merge this branch into any other branch
where you need the fix.

> To the people who know git better than me, does this workflow make
> sense? See
> any holes in it?

If I understand the problem and the graph correctly, your proposal makes a
lot of sense. But it has room for improvement.

In particular, I would not use a special "Enterprise5-features" branch.
Rather, I would create a separate feature branch for each feature that you
invent. Then you can merge the features selectively to "KDE master" and
"Enterprise5-release". The way that you proposed it, you would be able to
merge features to "KDE master" and "Enterprise5-release" only collectively.

Your picture doesn't show that you would merge from KDE master or KDE
release to your enterprise branches after each KDE major or minor release.
Do you intend to create a new set of enterprise branches for each of these
releases?

-- Hannes