[sldev] When does maint-viewer get merged?

Rob Lanphier robla at lindenlab.com
Sat Nov 29 15:51:51 PST 2008


On 11/29/2008 02:35 PM, Domino Marama wrote:
> I'm following jira vwr-9384 which was incorporated into maint-viewer-11
> branch awhile ago, but isn't in the 1.22 RCs. So at what point do the
> maint-viewer branches get merged?

To answer the question specifically about maint-viewer-11, it appears
that it will make it into the 1.23 series.

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.

Rob



More information about the SLDev mailing list