[sldev] When does maint-viewer get merged?

Rob Lanphier robla at lindenlab.com
Sat Nov 29 16:29:14 PST 2008


On 11/29/2008 03:51 PM, Rob Lanphier wrote:
> More generally, maint-viewer-* branches get merged into the trunk
> periodically, and release candidate branches get branched from the trunk
> periodically, so it can sometimes take a while before a branch that gets
> merged in actually finds its way into a release.  For example, the
> reason why changes from maint-viewer-11 aren't in 1.22 is that the 1.22
> branch from trunk occurred before the maint-viewer-11 merge into the
> trunk occurred.
>   


One correction:  maint-viewer-11 isn't *yet* merged into trunk, but will
be very soon.  Barring some horrific turn of events, it will almost
certainly make it into the 1.23 series.

Rob



More information about the SLDev mailing list