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

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.

-- 
 michael.meeks@novell.com  <><, Pseudo Engineer, itinerant idiot