Understanding the "Upstream syncing" work flow
tim.gardner at canonical.com
Fri Jun 20 14:35:09 UTC 2008
Dan Munckton wrote:
> Hi all
> I understand how I would rebase my local working tree to the upstream
> kernel. But am I right in presuming that when doing this for the main
> tree on kernel.ubuntu.com, it cannot be done in a local repository then
> pushed to the main repo? Surely this has to be done directly on the
> server? How do you guys manage to do this atomically so as not to
> disrupt folks who are pulling from the main repo?
> I have been reading up on the KernelTeam/Knowledgebase wiki pages to
> understand the processes and workflow the team uses to maintain the
> kernel. There's only a short section on "Upstream syncing" on the
> KernelMaintenance page and no notes on how it's done.
> Apologies if this has been covered here before, I did search the list
> archives but didn't find much detail on the process.
Staying in sync with a stable Ubuntu repo isn't much different then
staying in sync with Linus' tree. However, during the development cycle
the development repo (which is Intrepid right now) is rebased against
Linus' tree which makes life difficult for developers. We'll stop
rebasing around kernel freeze time, which is about late September.
Thereafter everything is a cherry-pick or single commit.
Tim Gardner tim.gardner at ubuntu.com
More information about the kernel-team