Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi all,

as promised, we have created a branch for the stabilization of the
3.5.x releases, called 'libreoffice-3-5'. It is based on master, last
pull on December 6, 2011 at about 13pm UTC. See also the tag
libreoffice-3-5-branch-point.

The following rules apply:

        + only bugfixes are allowed
        + no approval needed during beta phase until Jan 9, 2012
        + 1 approval needed during rc phase and upcoming bug fix releases
        + 2 approvals with different/no affiliation needed for late
          features

IMPORTANT: Every developer is responsible for pushing fixes into all
           appropriate branches. Note that we do not plan any merge
           from this branch to master or vice versa.

           Please, help use to make stable and usable 3.5 release.
           Do not forget to push useful fixes to this branch.

           "git cherry-pick commit-id" is your friend :-)
             


The 'master' branch is used for 3.6 development and has the rules:

        + free commit; do your best to do not break build and
          functionality
        + any development allowed


For further information about the roadmap, please check

        http://wiki.documentfoundation.org/ReleasePlan


Now, if you want to switch your clone to the libreoffice-3-5 branch,
do:

./g pull -r
./g checkout -b libreoffice-3-5 origin/libreoffice-3-5

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; ie. libreoffice-3-5 when you have switched to it.  This will
save you some git shouting at you.

Happy hacking,
Petr


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.