[meta-intel] Branch and tag management

Darren Hart dvhart at linux.intel.com
Fri Dec 7 11:26:01 PST 2012


I discussed branching and tagging with Beth today.

Beth uses branches for milestones as they sometimes change before the
final milestone build is complete. For reasons largely based in
paranoia, she would like to retain the milestone tags as long as the
milestones can be downloaded from the website, which is about 6 months.

So, what this means for meta-intel is the following. We will continue to
use branches for milestones and replace them with tags once the final
milestone is built. THIS MEANS THAT MILESTONE BRANCHES MUST TRACK MASTER
EXACTLY. NO CHERRY PICKING, FAST FORWARDS ONLY. If we don't do that, the
branch must stay around as it won't be exactly reproducible with a tag
once the branch is removed.

For the existing branches which do not have their HEAD also in master,
they will have to remain until the download is remove. This means that
eventually we will be able to purge the static milestone branches. The
only permanent branches will be master and one branch per release (no
release-next) branches should be needed.

I haven't replaced any of the old branches with tags quite yet as I
wanted this group to have a chance to respond or raise concerns before
we put this into effect. Any additional thoughts?

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel



More information about the meta-intel mailing list