> -----Original Message----- > From: Martin Sebor [mailto:[EMAIL PROTECTED] On Behalf Of Martin Sebor > Sent: Thursday, April 24, 2008 10:23 PM > To: [email protected] > Subject: Re: 4.3.x branch created > > Martin Sebor wrote: > > FYI: I've created the 4.3.x branch for your hacking pleasure. As > > the name implies, the branch is for changes that are backward but > > not necessarily forward compatible with 4.2.x. Binary or source > > incompatible changes should go on trunk only. > > To clarify: forward-compatible changes should go on the 4.2.x branch > for 4.2.2, with both sets of changes (i.e., 4.2.2 and 4.3) ending up > getting merged to trunk (5.0). At least I think that's the process > we ended up with the last time we discussed the branching policy.
So IIUC, changes are only checked in on the 4.2.x or 4.3.x branch depending on the compatibility of the change. Forward compatible changes from 4.2.x are periodically merged to 4.3.x. Changes to trunk should be minimal but, when necessary, only merged from one of these two branches. That about right? Though I'm still not exactly sure what trunk is supposed to represent in relation to the existing release branches. Brad.
