Hi all, there have been created the libreoffice-3-5-1 branch. It will be used for fine tuning of the 3.5.1 release.
It was created before the tag for 3.5.1-rc1 to avoid race condition in the automatically generated bugzilla comments. It was created already on Wednesday evening. I did not announce it because the 3 reviews were not needed before the tag for rc1. I just cherry picked all fixes from 3-5 branch. The cherry picking should not be needed in a normal case. I plan to create the branch and tag at the same time (within one hour). This time I was too fast with creating the branch and did not wait for one build fix that was more complicated than expected. I am sorry for potential confusion. The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-3-5 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The 'libreoffice-3-5' branch is still active and will be used for the 3.5.2 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan http://wiki.documentfoundation.org/Development/Branches Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-3-5-0 origin/libreoffice-3-5-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; e.g. libreoffice-3-5-1 when you have switched to it. This will save you some git shouting at you. Happy hacking, Petr -- Unsubscribe instructions: E-mail to l10n+h...@global.libreoffice.org Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://listarchives.libreoffice.org/global/l10n/ All messages sent to this list will be publicly archived and cannot be deleted