Kernel branches - Revision history

Glenn: -cats

2009-07-19T07:21:54Z

-cats

Arhuaco: /* Introduction */

2009-04-17T15:12:37Z

‎Introduction

Arhuaco: /* proposed */

2009-02-25T06:06:04Z

‎proposed

Arhuaco: /* More patch work-flow */

2009-02-25T05:45:24Z

‎More patch work-flow

Arhuaco: Fix.

2009-02-25T05:42:13Z

Fix.

Arhuaco: /* Credits */

2009-02-25T04:00:44Z

‎Credits

Arhuaco at 03:59, 25 February 2009

2009-02-25T03:59:29Z

Arhuaco: /* Credits */

2009-02-25T03:59:14Z

‎Credits

Arhuaco: /* Introduction */

2009-02-25T03:58:49Z

‎Introduction

Arhuaco: /* andy-tracking */

2009-02-25T03:57:43Z

‎andy-tracking

← Older revision		Revision as of 07:21, 19 July 2009
Line 93:		Line 93:

	[[Category:Kernel]]		[[Category:Kernel]]
−	~~[[Category:System Developers]]~~
−	~~[[Category:Application Developer]]~~

← Older revision		Revision as of 15:12, 17 April 2009
Line 2:		Line 2:

	This page explains how we take advantage of GIT branches for kernel development at Openmoko. The [[Kernel]] page is the sister of this page.		This page explains how we take advantage of GIT branches for kernel development at Openmoko. The [[Kernel]] page is the sister of this page.
		+
		+	'''Note''': At the moment we are only using the andy-tracking branch. This will change soon.

	=== How we use GIT History ===		=== How we use GIT History ===

@@ Line 81: / Line 81: @@
 == proposed ==
-This is a temporal branch with no historyWe use it as a temporal playground so that we can get patches ready for upstream.
+This is a temporal branch with no history. We use it as a temporal playground so that we can get patches ready for upstream.
 == Credits ==

@@ Line 78: / Line 78: @@
 upstream patches included, it makes sense to take the advantage from
 these even at the risk the patches will be rejected upstream.
 == Credits ==

@@ Line 20: / Line 20: @@
 branches a linear history that you can rewind, despite that they are
 being hard rebased constantly.
 == andy-tracking ==
@@ Line 28: / Line 26: @@
 Think of this as the branch where most of the action takes place (at least for most of us).
-This is the branch we usually target for patches but this is not always the case. If in doubt ask in the [http://lists.openmoko.org/mailman/listinfo/openmoko-kernel mailing list].
+If in doubt ask in the [http://lists.openmoko.org/mailman/listinfo/openmoko-kernel mailing list].
 == pending-tracking ==
-) pending-tracking created
+We have a "pending-tracking" that fits in between stable-tracking and
-−
-It's become clear we can end up with a bunch of patches from several
-directions heading into various upstreams if we're lucky.  So I have
-introduced a "pending-tracking" that fits inbetween stable-tracking and
 andy-tracking, to temporarily hold all the patches that are expected to
 come from upstream eventually.  Balaji-tracking feeds into this now, but
 there's other stuff like Matt's patches headed for s3c64xx upstream too.
-~ This also allows me to publicly rebase Balaji's patches without writing
-in balaji-tracking, and it also allows me to track changes from
+This allows for Balaji's patches being rebased without writing
 balaji-tracking and elsewhere in one place too.
-) How is it decided what goes on which branch
+Patch belongs in upstream, eg, Linus or Ben Dooks tree -->
-−
-~ - Patch belongs in upstream, eg, Linus or Ben Dooks tree -->
 pending-tracking.  It's kept segregated because we expect it to turn up
 by upstream rebase path; if it changes on the way we can adapt it in
 pending-tracking and rebase
-~ - Patch bases on stuff in pending-tracking, eg uses Balaji regulator
+Patch bases on stuff in pending-tracking, eg uses Balaji regulator
 things  --->  andy-tracking.  It's kept segregated because "it lives in
 the future" where the pending upstream patches arrived upstream.
-~ - Neither of the above ---> stable-tracking
+Neither of the above ---> stable-tracking
-) All patches end up in stable-tracking.
+All patches end up in this branch, that's what it expects.
 Stuff temporarily in pending-tracking will eventually turn up from
@@ Line 74: / Line 73: @@
 in andy-tracking gravitate to stable-tracking as soon as possible too.
+== More patch work-flow ==
-) We will fork the new stable from andy-tracking
 Because andy-tracking is "living in the future" with latest pending
 upstream patches included, it makes sense to take the advantage from
 these even at the risk the patches will be rejected upstream.
 == Credits ==
 This page started as an improvement of [http://lists.openmoko.org/pipermail/openmoko-kernel/2008-November/006945.html this email] sent by Andy Green to the [[Openmoko]] kernel list.
 {{Languages|Kernel_branches}}

← Older revision		Revision as of 04:00, 25 February 2009
Line 91:		Line 91:

	This page started as an improvement of [http://lists.openmoko.org/pipermail/openmoko-kernel/2008-November/006945.html this email] sent by Andy Green to the [[Openmoko]] kernel list.		This page started as an improvement of [http://lists.openmoko.org/pipermail/openmoko-kernel/2008-November/006945.html this email] sent by Andy Green to the [[Openmoko]] kernel list.
		+
		+
		+	{{Languages\|Kernel_branches}}

@@ Line 87: / Line 87: @@
 automatically be ready for either andy-tracking, pending-tracking
 (usually) or stable-tracking depending on what it touched.
 [[Category:Kernel]]
 [[Category:System Developers]]
 [[Category:Application Developer]]

← Older revision		Revision as of 03:59, 25 February 2009
Line 21:		Line 21:
	being hard rebased constantly.		being hard rebased constantly.

−	~~=== Credits ===~~

−	~~This page started as an improvement of [http://lists.openmoko.org/pipermail/openmoko-kernel/2008-November/006945.html this email] sent by Andy Green to the [[Openmoko]] kernel list.~~

	== andy-tracking ==		== andy-tracking ==

@@ Line 1: / Line 1: @@
 == Introduction ==
 This page explains how we take advantage of GIT branches for kernel development at Openmoko. The [[Kernel]] page is the sister of this page.
@@ Line 22: / Line 20: @@
 branches a linear history that you can rewind, despite that they are
 being hard rebased constantly.
 == andy-tracking ==