Re: [Libreoffice] [ANNOUNCE] libreoffice-3.3.99.4 tag created (3.4.0-beta4)

Thank you all for the answers.

I guess my understanding of the tree analogy wasn't correct. So the trunk is
the main code which comes from version 0.0 and will keep growing and from
which a new branch (3.5) will soon "sprout" (or is this a sub-branch from a
3.0 branch?)

Within the 3.4 branch a new sub-branch was created (named 3.4Beta). Any
fixes to bugs found in Beta are added to the sub-branch and also to the 3.4
branch (and later to the trunk) while new features are only added to the 3.4
branch (and at some point to the trunk). This branch will continue to "grow"
and from which will sprout 3.4RC, 3.4.0, 3.4.1
(please correct my tree analogy if this is not it :) )

Am I wrong to assume that a current nightly build from the 3.4 branch is a
better option for Beta testing (since the dev build fix was committed) than
the official Beta4?

Why not skip Beta4 and release Beta5? It's not unusual in software
development to skip releases...

On Thu, May 5, 2011 at 10:16 AM, Michael Meeks [via Document Foundation Mail
Archive] <ml-node+2902654-2051771822-251143@n3.nabble.com> wrote:

> Hi there,
>
> On Thu, 2011-05-05 at 01:13 -0700, plino wrote:
> > When you do a code freeze for a Beta (or any) release it means that a
> branch
> > is created and to that branch only fixes are added but not new features,
> > correct?
>
>         Good question - that branch is libreoffice-3-4 and you have it
> about
> right; yes. For new features we need some double (or more) code review
> and we use that very sparingly; so far I've only seen one go in (fixing
> the document shadows).
>
> > Are the fixes to the Beta branch incorporated to the main code (trunk?)?
> > I.e. the "trunk" contains all the fixes from the Beta branch plus new
> > features (which probably have other bugs), right?
>
>         That process is a bit slower; some fixes are committed to master,
> and
> then cherry-picked back; but in general fixes go to libreoffice-3-4 and
> then are merged back to master (somewhat intermittently). So it is best
> to test a libreoffice-3-4 build if possible.
>
>         HTH,
>
>                 Michael.
>
> --
>  [hidden email]<http://user/SendEmail.jtp?type=node&node=2902654&i=0&by-user=t> <><, Pseudo 
> Engineer, itinerant idiot
>
>
> _______________________________________________
> LibreOffice mailing list
> [hidden email]<http://user/SendEmail.jtp?type=node&node=2902654&i=1&by-user=t>
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
> ------------------------------
>  If you reply to this email, your message will be added to the discussion
> below:
>
> http://nabble.documentfoundation.org/ANNOUNCE-libreoffice-3-3-99-4-tag-created-3-4-0-beta4-tp2895369p2902654.html
>  To unsubscribe from [ANNOUNCE] libreoffice-3.3.99.4 tag created
> (3.4.0-beta4), click 
> here<http://nabble.documentfoundation.org/template/NamlServlet.jtp?macro=unsubscribe_by_code&node=2895369&code=cGVkbGlub0BnbWFpbC5jb218Mjg5NTM2OXwtMTcxMDU2NTk1NA==>.


--
View this message in context: 
http://nabble.documentfoundation.org/ANNOUNCE-libreoffice-3-3-99-4-tag-created-3-4-0-beta4-tp2895369p2902834.html
Sent from the Dev mailing list archive at Nabble.com.