[Libreoffice] Branch libreoffice-3-3-1 created

Jan Holesovsky kendy at suse.cz
Mon Feb 7 12:45:01 PST 2011


Hi all,

Similarly to the release of 3.3.0, we have created a branch for the
stabilization of the 3.3.1, called 'libreoffice-3-3-1'.  It is not based
on a tag yet, Petr will tag tomorrow.

The following rules apply:

        + any commit has to be reviewed by 3 people
        + preferably commit only translation fixes, or blocker fixes
        + only cherry-pick from the libreoffice-3-3 branch

The 'libreoffice-3-3' branch is still active, will be used for the next
bugfix release (3.3.2), and has the following rules:

        + any commit needs review by 1 person
        + only safe fixes are allowed
        + changes are regularly merged into master

The 'master' branch is used for 3.4 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-3-1 branch,
do:

git pull -r
bin/g pull -r
git checkout -b libreoffice-3-3-1 origin/libreoffice-3-3-1
bin/g checkout -b libreoffice-3-3-1 origin/libreoffice-3-3-1

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-3-1 when you have switched to it.  This will
save you some git shouting at you.

Happy hacking,
Kendy



More information about the LibreOffice mailing list